Snap for 7506386 from d5f40beec50de1d82aa8e2d23ef1f36c1d00f8ba to sc-d1-release

Change-Id: I40c3db99f954fd2dece340c30a1397485a0e7fd6
diff --git a/31/64/arm64_armv8-a/source-based/libmedia_omx.so.lsdump b/31/64/arm64_armv8-a/source-based/libmedia_omx.so.lsdump
index 57efa6b..48d320e 100644
--- a/31/64/arm64_armv8-a/source-based/libmedia_omx.so.lsdump
+++ b/31/64/arm64_armv8-a/source-based/libmedia_omx.so.lsdump
@@ -209,15 +209,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 2560,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIA6_Pv",
    "name" : "void *[6]",
    "referenced_type" : "_ZTIPv",
@@ -9661,12 +9652,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -19529,6 +19520,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 8,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -35784,7 +35784,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -35860,20 +35860,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 448,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 20928,
-     "referenced_type" : "_ZTIm"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 2624,
+   "size" : 80,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/arm64_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump b/31/64/arm64_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
index cb0d3ba..5f38956 100644
--- a/31/64/arm64_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/31/64/arm64_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -199,15 +199,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 2560,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA64_h",
    "name" : "unsigned char [64]",
@@ -11318,12 +11309,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -20042,6 +20033,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 8,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -37063,7 +37063,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -37139,20 +37139,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 448,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 20928,
-     "referenced_type" : "_ZTIm"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 2624,
+   "size" : 80,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/arm64_armv8-a/source-based/libstagefright_foundation.so.lsdump b/31/64/arm64_armv8-a/source-based/libstagefright_foundation.so.lsdump
index bd25eed..da6e48a 100644
--- a/31/64/arm64_armv8-a/source-based/libstagefright_foundation.so.lsdump
+++ b/31/64/arm64_armv8-a/source-based/libstagefright_foundation.so.lsdump
@@ -11,15 +11,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 2560,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIA6_i",
    "name" : "int [6]",
@@ -870,6 +861,12 @@
    "name" : "_ZN7android8AMessage4Item7setNameEPKcm"
   },
   {
+   "name" : "_ZN7android8AMessage4ItemC1EPKcm"
+  },
+  {
+   "name" : "_ZN7android8AMessage4ItemC2EPKcm"
+  },
+  {
    "name" : "_ZN7android8AMessage4postEl"
   },
   {
@@ -1324,6 +1321,14 @@
    "name" : "_ZNSt3__16vectorIN7android17AudioPresentationENS_9allocatorIS2_EEE21__push_back_slow_pathIS2_EEvOT_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRPKcRmEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEE6assignIPS3_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS3_NS_15iterator_traitsISA_E9referenceEEE5valueEvE4typeESA_SA_"
+  },
+  {
    "name" : "_ZThn16_N7android8MetaDataD0Ev"
   },
   {
@@ -6605,12 +6610,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -10015,7 +10020,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_arm64_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
+     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_arm64_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_8AMessageEEE"
@@ -10241,6 +10246,44 @@
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
   {
+   "function_name" : "android::AMessage::Item::Item",
+   "linker_set_key" : "_ZN7android8AMessage4ItemC1EPKcm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android8AMessage4ItemE"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "function_name" : "android::AMessage::Item::Item",
+   "linker_set_key" : "_ZN7android8AMessage4ItemC2EPKcm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android8AMessage4ItemE"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
    "function_name" : "android::AMessage::post",
    "linker_set_key" : "_ZN7android8AMessage4postEl",
    "parameters" :
@@ -16435,7 +16478,7 @@
    "name" : "const android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIKN7android8AMessageE",
-   "size" : 2624,
+   "size" : 80,
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -21837,7 +21880,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_arm64_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_arm64_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -21873,13 +21916,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_arm64_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_arm64_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 192,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_arm64_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_arm64_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
@@ -23464,7 +23507,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -23540,20 +23583,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 448,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 20928,
-     "referenced_type" : "_ZTIm"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 2624,
+   "size" : 80,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/arm64_armv8-a/source-based/libstagefright_omx.so.lsdump b/31/64/arm64_armv8-a/source-based/libstagefright_omx.so.lsdump
index c4d1f1f..a53a884 100644
--- a/31/64/arm64_armv8-a/source-based/libstagefright_omx.so.lsdump
+++ b/31/64/arm64_armv8-a/source-based/libstagefright_omx.so.lsdump
@@ -181,15 +181,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 2560,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA64_h",
    "name" : "unsigned char [64]",
@@ -13262,12 +13253,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -22524,6 +22515,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 8,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -40710,7 +40710,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -40786,20 +40786,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 448,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 20928,
-     "referenced_type" : "_ZTIm"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 2624,
+   "size" : 80,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/arm_armv7-a-neon/source-based/libmedia_omx.so.lsdump b/31/64/arm_armv7-a-neon/source-based/libmedia_omx.so.lsdump
index 064c2ee..dbce07f 100644
--- a/31/64/arm_armv7-a-neon/source-based/libmedia_omx.so.lsdump
+++ b/31/64/arm_armv7-a-neon/source-based/libmedia_omx.so.lsdump
@@ -208,15 +208,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 2048,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIA6_Pv",
    "name" : "void *[6]",
@@ -9661,12 +9652,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -19529,6 +19520,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -35765,7 +35765,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -35804,7 +35804,7 @@
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -35841,20 +35841,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 16640,
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 2088,
+   "size" : 44,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump b/31/64/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 89c5852..f404fcc 100644
--- a/31/64/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/31/64/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -199,15 +199,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 2048,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA64_h",
    "name" : "unsigned char [64]",
@@ -11295,12 +11286,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -20019,6 +20010,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -37030,7 +37030,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -37069,7 +37069,7 @@
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -37106,20 +37106,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 16640,
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 2088,
+   "size" : 44,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/arm_armv7-a-neon/source-based/libstagefright_foundation.so.lsdump b/31/64/arm_armv7-a-neon/source-based/libstagefright_foundation.so.lsdump
index 12a3a3f..2e61c2d 100644
--- a/31/64/arm_armv7-a-neon/source-based/libstagefright_foundation.so.lsdump
+++ b/31/64/arm_armv7-a-neon/source-based/libstagefright_foundation.so.lsdump
@@ -11,15 +11,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 2048,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIA6_i",
    "name" : "int [6]",
@@ -870,6 +861,12 @@
    "name" : "_ZN7android8AMessage4Item7setNameEPKcj"
   },
   {
+   "name" : "_ZN7android8AMessage4ItemC1EPKcj"
+  },
+  {
+   "name" : "_ZN7android8AMessage4ItemC2EPKcj"
+  },
+  {
    "name" : "_ZN7android8AMessage4postEx"
   },
   {
@@ -1324,6 +1321,14 @@
    "name" : "_ZNSt3__16vectorIN7android17AudioPresentationENS_9allocatorIS2_EEE21__push_back_slow_pathIS2_EEvOT_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRPKcRjEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEE6assignIPS3_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS3_NS_15iterator_traitsISA_E9referenceEEE5valueEvE4typeESA_SA_"
+  },
+  {
    "name" : "_ZThn8_N7android8MetaDataD0Ev"
   },
   {
@@ -6605,12 +6610,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -10015,7 +10020,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_arm_armv7-a-neon_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
+     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_arm_armv7-a-neon_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_8AMessageEEE"
@@ -10241,6 +10246,44 @@
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
   {
+   "function_name" : "android::AMessage::Item::Item",
+   "linker_set_key" : "_ZN7android8AMessage4ItemC1EPKcj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android8AMessage4ItemE"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "function_name" : "android::AMessage::Item::Item",
+   "linker_set_key" : "_ZN7android8AMessage4ItemC2EPKcj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android8AMessage4ItemE"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
    "function_name" : "android::AMessage::post",
    "linker_set_key" : "_ZN7android8AMessage4postEx",
    "parameters" :
@@ -16411,13 +16454,13 @@
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIKN7android8AMessageE",
    "name" : "const android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIKN7android8AMessageE",
-   "size" : 2088,
+   "size" : 44,
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -21819,7 +21862,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_arm_armv7-a-neon_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_arm_armv7-a-neon_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -21855,13 +21898,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_arm_armv7-a-neon_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_arm_armv7-a-neon_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 160,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_arm_armv7-a-neon_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_arm_armv7-a-neon_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
@@ -23446,7 +23489,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -23485,7 +23528,7 @@
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -23522,20 +23565,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 16640,
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 2088,
+   "size" : 44,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/arm_armv7-a-neon/source-based/libstagefright_omx.so.lsdump b/31/64/arm_armv7-a-neon/source-based/libstagefright_omx.so.lsdump
index 33cefe1..6a43c4f 100644
--- a/31/64/arm_armv7-a-neon/source-based/libstagefright_omx.so.lsdump
+++ b/31/64/arm_armv7-a-neon/source-based/libstagefright_omx.so.lsdump
@@ -181,15 +181,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 2048,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA64_h",
    "name" : "unsigned char [64]",
@@ -13259,12 +13250,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -22002,6 +21993,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -38790,7 +38790,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -38829,7 +38829,7 @@
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -38866,20 +38866,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 16640,
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 2088,
+   "size" : 44,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/arm_armv8-a/source-based/libmedia_omx.so.lsdump b/31/64/arm_armv8-a/source-based/libmedia_omx.so.lsdump
index ef23309..9006183 100644
--- a/31/64/arm_armv8-a/source-based/libmedia_omx.so.lsdump
+++ b/31/64/arm_armv8-a/source-based/libmedia_omx.so.lsdump
@@ -208,15 +208,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 2048,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIA6_Pv",
    "name" : "void *[6]",
@@ -9661,12 +9652,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -19529,6 +19520,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -35765,7 +35765,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -35804,7 +35804,7 @@
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -35841,20 +35841,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 16640,
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 2088,
+   "size" : 44,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/arm_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump b/31/64/arm_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 89c5852..f404fcc 100644
--- a/31/64/arm_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/31/64/arm_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -199,15 +199,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 2048,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA64_h",
    "name" : "unsigned char [64]",
@@ -11295,12 +11286,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -20019,6 +20010,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -37030,7 +37030,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -37069,7 +37069,7 @@
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -37106,20 +37106,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 16640,
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 2088,
+   "size" : 44,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/arm_armv8-a/source-based/libstagefright_foundation.so.lsdump b/31/64/arm_armv8-a/source-based/libstagefright_foundation.so.lsdump
index b0666cb..7849760 100644
--- a/31/64/arm_armv8-a/source-based/libstagefright_foundation.so.lsdump
+++ b/31/64/arm_armv8-a/source-based/libstagefright_foundation.so.lsdump
@@ -11,15 +11,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 2048,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIA6_i",
    "name" : "int [6]",
@@ -870,6 +861,12 @@
    "name" : "_ZN7android8AMessage4Item7setNameEPKcj"
   },
   {
+   "name" : "_ZN7android8AMessage4ItemC1EPKcj"
+  },
+  {
+   "name" : "_ZN7android8AMessage4ItemC2EPKcj"
+  },
+  {
    "name" : "_ZN7android8AMessage4postEx"
   },
   {
@@ -1324,6 +1321,14 @@
    "name" : "_ZNSt3__16vectorIN7android17AudioPresentationENS_9allocatorIS2_EEE21__push_back_slow_pathIS2_EEvOT_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRPKcRjEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEE6assignIPS3_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS3_NS_15iterator_traitsISA_E9referenceEEE5valueEvE4typeESA_SA_"
+  },
+  {
    "name" : "_ZThn8_N7android8MetaDataD0Ev"
   },
   {
@@ -6605,12 +6610,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -10015,7 +10020,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_arm_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
+     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_arm_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_8AMessageEEE"
@@ -10241,6 +10246,44 @@
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
   {
+   "function_name" : "android::AMessage::Item::Item",
+   "linker_set_key" : "_ZN7android8AMessage4ItemC1EPKcj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android8AMessage4ItemE"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "function_name" : "android::AMessage::Item::Item",
+   "linker_set_key" : "_ZN7android8AMessage4ItemC2EPKcj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android8AMessage4ItemE"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
    "function_name" : "android::AMessage::post",
    "linker_set_key" : "_ZN7android8AMessage4postEx",
    "parameters" :
@@ -16411,13 +16454,13 @@
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIKN7android8AMessageE",
    "name" : "const android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIKN7android8AMessageE",
-   "size" : 2088,
+   "size" : 44,
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -21819,7 +21862,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_arm_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_arm_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -21855,13 +21898,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_arm_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_arm_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 160,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_arm_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_arm_armv8-a_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
@@ -23446,7 +23489,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -23485,7 +23528,7 @@
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -23522,20 +23565,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 16640,
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 2088,
+   "size" : 44,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/arm_armv8-a/source-based/libstagefright_omx.so.lsdump b/31/64/arm_armv8-a/source-based/libstagefright_omx.so.lsdump
index 7279239..f9b1807 100644
--- a/31/64/arm_armv8-a/source-based/libstagefright_omx.so.lsdump
+++ b/31/64/arm_armv8-a/source-based/libstagefright_omx.so.lsdump
@@ -181,15 +181,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 2048,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA64_h",
    "name" : "unsigned char [64]",
@@ -13259,12 +13250,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -22002,6 +21993,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -38790,7 +38790,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -38829,7 +38829,7 @@
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -38866,20 +38866,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 16640,
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 2088,
+   "size" : 44,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/x86/source-based/libmedia_omx.so.lsdump b/31/64/x86/source-based/libmedia_omx.so.lsdump
index c0c410d..183b0d0 100644
--- a/31/64/x86/source-based/libmedia_omx.so.lsdump
+++ b/31/64/x86/source-based/libmedia_omx.so.lsdump
@@ -209,15 +209,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 1792,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIA6_Pv",
    "name" : "void *[6]",
    "referenced_type" : "_ZTIPv",
@@ -9660,12 +9651,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -19528,6 +19519,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -35764,7 +35764,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -35840,20 +35840,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 14592,
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 1828,
+   "size" : 44,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump b/31/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
index f8cdeb3..cf0a48d 100644
--- a/31/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/31/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -199,15 +199,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 1792,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA64_h",
    "name" : "unsigned char [64]",
@@ -11297,12 +11288,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -20021,6 +20012,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -37032,7 +37032,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -37108,20 +37108,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 14592,
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 1828,
+   "size" : 44,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/x86/source-based/libstagefright_foundation.so.lsdump b/31/64/x86/source-based/libstagefright_foundation.so.lsdump
index a16aa46..88a38a4 100644
--- a/31/64/x86/source-based/libstagefright_foundation.so.lsdump
+++ b/31/64/x86/source-based/libstagefright_foundation.so.lsdump
@@ -12,15 +12,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 1792,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIA6_i",
    "name" : "int [6]",
    "referenced_type" : "_ZTIi",
@@ -869,6 +860,12 @@
    "name" : "_ZN7android8AMessage4Item7setNameEPKcj"
   },
   {
+   "name" : "_ZN7android8AMessage4ItemC1EPKcj"
+  },
+  {
+   "name" : "_ZN7android8AMessage4ItemC2EPKcj"
+  },
+  {
    "name" : "_ZN7android8AMessage4postEx"
   },
   {
@@ -1323,6 +1320,14 @@
    "name" : "_ZNSt3__16vectorIN7android17AudioPresentationENS_9allocatorIS2_EEE21__push_back_slow_pathIS2_EEvOT_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRPKcRjEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEE6assignIPS3_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS3_NS_15iterator_traitsISA_E9referenceEEE5valueEvE4typeESA_SA_"
+  },
+  {
    "name" : "_ZThn8_N7android8MetaDataD0Ev"
   },
   {
@@ -6604,12 +6609,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -10014,7 +10019,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_x86_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
+     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_x86_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_8AMessageEEE"
@@ -10240,6 +10245,44 @@
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
   {
+   "function_name" : "android::AMessage::Item::Item",
+   "linker_set_key" : "_ZN7android8AMessage4ItemC1EPKcj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android8AMessage4ItemE"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "function_name" : "android::AMessage::Item::Item",
+   "linker_set_key" : "_ZN7android8AMessage4ItemC2EPKcj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android8AMessage4ItemE"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
    "function_name" : "android::AMessage::post",
    "linker_set_key" : "_ZN7android8AMessage4postEx",
    "parameters" :
@@ -16416,7 +16459,7 @@
    "name" : "const android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIKN7android8AMessageE",
-   "size" : 1828,
+   "size" : 44,
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -21818,7 +21861,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_x86_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_x86_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -21854,13 +21897,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 96,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_x86_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_x86_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_x86_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_x86_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
@@ -23445,7 +23488,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -23521,20 +23564,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 14592,
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 1828,
+   "size" : 44,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/x86/source-based/libstagefright_omx.so.lsdump b/31/64/x86/source-based/libstagefright_omx.so.lsdump
index 6c893c3..2daed7b 100644
--- a/31/64/x86/source-based/libstagefright_omx.so.lsdump
+++ b/31/64/x86/source-based/libstagefright_omx.so.lsdump
@@ -181,15 +181,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 1792,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA64_h",
    "name" : "unsigned char [64]",
@@ -13258,12 +13249,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -22001,6 +21992,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -38789,7 +38789,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -38865,20 +38865,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 14592,
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 1828,
+   "size" : 44,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/x86_64/source-based/libmedia_omx.so.lsdump b/31/64/x86_64/source-based/libmedia_omx.so.lsdump
index 68d0070..5b1af15 100644
--- a/31/64/x86_64/source-based/libmedia_omx.so.lsdump
+++ b/31/64/x86_64/source-based/libmedia_omx.so.lsdump
@@ -209,15 +209,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 2560,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIA6_Pv",
    "name" : "void *[6]",
    "referenced_type" : "_ZTIPv",
@@ -9660,12 +9651,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -19528,6 +19519,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 8,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -35783,7 +35783,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -35859,20 +35859,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 448,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 20928,
-     "referenced_type" : "_ZTIm"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 2624,
+   "size" : 80,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump b/31/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 48ca94f..2aa75a8 100644
--- a/31/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/31/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -199,15 +199,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 2560,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA64_h",
    "name" : "unsigned char [64]",
@@ -11316,12 +11307,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -20040,6 +20031,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 8,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -37061,7 +37061,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -37137,20 +37137,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 448,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 20928,
-     "referenced_type" : "_ZTIm"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 2624,
+   "size" : 80,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/x86_64/source-based/libstagefright_foundation.so.lsdump b/31/64/x86_64/source-based/libstagefright_foundation.so.lsdump
index 447c202..0aea8e6 100644
--- a/31/64/x86_64/source-based/libstagefright_foundation.so.lsdump
+++ b/31/64/x86_64/source-based/libstagefright_foundation.so.lsdump
@@ -11,15 +11,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 2560,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "_ZTIA6_i",
    "name" : "int [6]",
@@ -869,6 +860,12 @@
    "name" : "_ZN7android8AMessage4Item7setNameEPKcm"
   },
   {
+   "name" : "_ZN7android8AMessage4ItemC1EPKcm"
+  },
+  {
+   "name" : "_ZN7android8AMessage4ItemC2EPKcm"
+  },
+  {
    "name" : "_ZN7android8AMessage4postEl"
   },
   {
@@ -1323,6 +1320,14 @@
    "name" : "_ZNSt3__16vectorIN7android17AudioPresentationENS_9allocatorIS2_EEE21__push_back_slow_pathIS2_EEvOT_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRPKcRmEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEE6assignIPS3_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS3_NS_15iterator_traitsISA_E9referenceEEE5valueEvE4typeESA_SA_"
+  },
+  {
    "name" : "_ZThn16_N7android8MetaDataD0Ev"
   },
   {
@@ -6604,12 +6609,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -10014,7 +10019,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
+     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_8AMessageEEE"
@@ -10240,6 +10245,44 @@
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
   {
+   "function_name" : "android::AMessage::Item::Item",
+   "linker_set_key" : "_ZN7android8AMessage4ItemC1EPKcm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android8AMessage4ItemE"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "function_name" : "android::AMessage::Item::Item",
+   "linker_set_key" : "_ZN7android8AMessage4ItemC2EPKcm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android8AMessage4ItemE"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
    "function_name" : "android::AMessage::post",
    "linker_set_key" : "_ZN7android8AMessage4postEl",
    "parameters" :
@@ -16434,7 +16477,7 @@
    "name" : "const android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIKN7android8AMessageE",
-   "size" : 2624,
+   "size" : 80,
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -21836,7 +21879,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -21872,13 +21915,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 192,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
@@ -23463,7 +23506,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -23539,20 +23582,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 448,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 20928,
-     "referenced_type" : "_ZTIm"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 2624,
+   "size" : 80,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/x86_64/source-based/libstagefright_omx.so.lsdump b/31/64/x86_64/source-based/libstagefright_omx.so.lsdump
index 5711ebb..d1cf929 100644
--- a/31/64/x86_64/source-based/libstagefright_omx.so.lsdump
+++ b/31/64/x86_64/source-based/libstagefright_omx.so.lsdump
@@ -181,15 +181,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 2560,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA64_h",
    "name" : "unsigned char [64]",
@@ -13265,12 +13256,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -22527,6 +22518,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 8,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -40713,7 +40713,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -40789,20 +40789,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 448,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 20928,
-     "referenced_type" : "_ZTIm"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 2624,
+   "size" : 80,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/x86_x86_64/source-based/libmedia_omx.so.lsdump b/31/64/x86_x86_64/source-based/libmedia_omx.so.lsdump
index 894e719..47ee4ae 100644
--- a/31/64/x86_x86_64/source-based/libmedia_omx.so.lsdump
+++ b/31/64/x86_x86_64/source-based/libmedia_omx.so.lsdump
@@ -209,15 +209,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 1792,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIA6_Pv",
    "name" : "void *[6]",
    "referenced_type" : "_ZTIPv",
@@ -9660,12 +9651,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -19528,6 +19519,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -35764,7 +35764,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -35840,20 +35840,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 14592,
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 1828,
+   "size" : 44,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump b/31/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
index f8cdeb3..cf0a48d 100644
--- a/31/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/31/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -199,15 +199,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 1792,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA64_h",
    "name" : "unsigned char [64]",
@@ -11297,12 +11288,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -20021,6 +20012,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -37032,7 +37032,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -37108,20 +37108,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 14592,
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 1828,
+   "size" : 44,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/x86_x86_64/source-based/libstagefright_foundation.so.lsdump b/31/64/x86_x86_64/source-based/libstagefright_foundation.so.lsdump
index 1f275a0..2f5ff9c 100644
--- a/31/64/x86_x86_64/source-based/libstagefright_foundation.so.lsdump
+++ b/31/64/x86_x86_64/source-based/libstagefright_foundation.so.lsdump
@@ -12,15 +12,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 1792,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIA6_i",
    "name" : "int [6]",
    "referenced_type" : "_ZTIi",
@@ -869,6 +860,12 @@
    "name" : "_ZN7android8AMessage4Item7setNameEPKcj"
   },
   {
+   "name" : "_ZN7android8AMessage4ItemC1EPKcj"
+  },
+  {
+   "name" : "_ZN7android8AMessage4ItemC2EPKcj"
+  },
+  {
    "name" : "_ZN7android8AMessage4postEx"
   },
   {
@@ -1323,6 +1320,14 @@
    "name" : "_ZNSt3__16vectorIN7android17AudioPresentationENS_9allocatorIS2_EEE21__push_back_slow_pathIS2_EEvOT_"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEE24__emplace_back_slow_pathIJRPKcRjEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEE6assignIPS3_EENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIS3_NS_15iterator_traitsISA_E9referenceEEE5valueEvE4typeESA_SA_"
+  },
+  {
    "name" : "_ZThn8_N7android8MetaDataD0Ev"
   },
   {
@@ -6604,12 +6609,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -10014,7 +10019,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_x86_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
+     "referenced_type" : "_ZTIPN7android8AHandlerE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_x86_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/AHandler.sdump"
     },
     {
      "referenced_type" : "_ZTIRKN7android2spINS_8AMessageEEE"
@@ -10240,6 +10245,44 @@
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
   {
+   "function_name" : "android::AMessage::Item::Item",
+   "linker_set_key" : "_ZN7android8AMessage4ItemC1EPKcj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android8AMessage4ItemE"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "function_name" : "android::AMessage::Item::Item",
+   "linker_set_key" : "_ZN7android8AMessage4ItemC2EPKcj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android8AMessage4ItemE"
+    },
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
    "function_name" : "android::AMessage::post",
    "linker_set_key" : "_ZN7android8AMessage4postEx",
    "parameters" :
@@ -16416,7 +16459,7 @@
    "name" : "const android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIKN7android8AMessageE",
-   "size" : 1828,
+   "size" : 44,
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -21818,7 +21861,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_x86_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_x86_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -21854,13 +21897,13 @@
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 96,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_x86_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_x86_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.S_x86_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
+     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/foundation/libstagefright_foundation/android_vendor.31_x86_x86_64_static/obj/frameworks/av/media/libstagefright/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
@@ -23445,7 +23488,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -23521,20 +23564,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 14592,
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 1828,
+   "size" : 44,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [
diff --git a/31/64/x86_x86_64/source-based/libstagefright_omx.so.lsdump b/31/64/x86_x86_64/source-based/libstagefright_omx.so.lsdump
index 508869d..934584a 100644
--- a/31/64/x86_x86_64/source-based/libstagefright_omx.so.lsdump
+++ b/31/64/x86_x86_64/source-based/libstagefright_omx.so.lsdump
@@ -181,15 +181,6 @@
    "source_file" : "system/logging/liblog/include_vndk/log/log_read.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIA64_N7android8AMessage4ItemE",
-   "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
-   "self_type" : "_ZTIA64_N7android8AMessage4ItemE",
-   "size" : 1792,
-   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "_ZTIA64_h",
    "name" : "unsigned char [64]",
@@ -13258,12 +13249,12 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 64,
+     "enum_field_value" : 256,
      "name" : "android::AMessage::kMaxNumItems"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
-   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:307:5)",
+   "name" : "android::AMessage::(anonymous enum at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:312:5)",
    "referenced_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "self_type" : "_ZTIN7android8AMessage13$kMaxNumItemsE",
    "size" : 4,
@@ -22001,6 +21992,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPN7android8AMessage4ItemE",
+   "name" : "android::AMessage::Item *",
+   "referenced_type" : "_ZTIN7android8AMessage4ItemE",
+   "self_type" : "_ZTIPN7android8AMessage4ItemE",
+   "size" : 4,
+   "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android8AMessageE",
    "name" : "android::AMessage *",
    "referenced_type" : "_ZTIN7android8AMessageE",
@@ -38789,7 +38789,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7android8AMessage4ItemUt_E",
-   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:290:9)",
+   "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h:293:9)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7android8AMessage4ItemUt_E",
    "self_type" : "_ZTIN7android8AMessage4ItemUt_E",
@@ -38865,20 +38865,14 @@
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "_ZTIA64_N7android8AMessage4ItemE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumItems",
-     "field_offset" : 14592,
-     "referenced_type" : "_ZTIj"
+     "referenced_type" : "_ZTINSt3__16vectorIN7android8AMessage4ItemENS_9allocatorIS3_EEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8AMessageE",
    "name" : "android::AMessage",
    "referenced_type" : "_ZTIN7android8AMessageE",
    "self_type" : "_ZTIN7android8AMessageE",
-   "size" : 1828,
+   "size" : 44,
    "source_file" : "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "vtable_components" :
    [