Updating platform SDK version for R

  * Update NDK abi dumps

Test: build + boot

bug:150281259

Change-Id: I8ce96b67008b1fd10cc5a105e12ad2fdacac1c5b
Merged-In: I8ce96b67008b1fd10cc5a105e12ad2fdacac1c5b

8 files changed, 72 insertions, 2056 deletions

diff --git a/30/32/arm_armv7-a-neon/source-based/liblog.so.lsdump b/30/32/arm_armv7-a-neon/source-based/liblog.so.lsdump
index 5b24445..3e3856d 100644
--- a/30/32/arm_armv7-a-neon/source-based/liblog.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/liblog.so.lsdump
@@ -1346,7 +1346,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIi",
@@ -1370,7 +1370,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIl",
@@ -1382,7 +1382,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIl",
@@ -1394,7 +1394,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIi",
@@ -1406,7 +1406,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -1424,7 +1424,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -1541,7 +1541,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -1556,7 +1556,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -1682,228 +1682,12 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:",
-   "self_type" : "_ZTIRK8timespec#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/log_event_write.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/log_event_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/log_time.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/log_time.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_writer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logger_name.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logger_name.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logger_read.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logger_read.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logger_write.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logger_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/properties.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/properties.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/log_event_write.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/log_event_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/log_time.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/log_time.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_writer.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logger_write.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logger_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/properties.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/properties.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "pointer_types" :
@@ -2045,24 +1829,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11EventTagMap",
-   "name" : "const EventTagMap *",
-   "referenced_type" : "_ZTIK11EventTagMap#ODR:",
-   "self_type" : "_ZTIPK11EventTagMap#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11EventTagMap",
-   "name" : "const EventTagMap *",
-   "referenced_type" : "_ZTIK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIPK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK17AndroidLogEntry_t",
    "name" : "const AndroidLogEntry_t *",
    "referenced_type" : "_ZTIK17AndroidLogEntry_t",
@@ -2135,15 +1901,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP28android_log_context_internal",
-   "name" : "android_log_context_internal **",
-   "referenced_type" : "_ZTIP28android_log_context_internal#ODR:",
-   "self_type" : "_ZTIPP28android_log_context_internal#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
    "referenced_type" : "_ZTIPKc",
@@ -2340,11 +2097,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -2853,7 +2605,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/32/x86/source-based/liblog.so.lsdump b/30/32/x86/source-based/liblog.so.lsdump
index c50e640..8315098 100644
--- a/30/32/x86/source-based/liblog.so.lsdump
+++ b/30/32/x86/source-based/liblog.so.lsdump
@@ -1345,7 +1345,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIi",
@@ -1369,7 +1369,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIl",
@@ -1381,7 +1381,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIl",
@@ -1393,7 +1393,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIi",
@@ -1405,7 +1405,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -1423,7 +1423,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -1540,7 +1540,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -1555,7 +1555,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -1681,228 +1681,12 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:",
-   "self_type" : "_ZTIRK8timespec#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/log_event_write.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/log_event_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/log_time.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/log_time.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_writer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logger_name.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logger_name.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logger_read.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logger_read.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logger_write.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logger_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/properties.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/properties.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/log_event_write.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/log_event_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/log_time.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/log_time.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_writer.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logger_write.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logger_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/properties.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/properties.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "pointer_types" :
@@ -2044,24 +1828,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11EventTagMap",
-   "name" : "const EventTagMap *",
-   "referenced_type" : "_ZTIK11EventTagMap#ODR:",
-   "self_type" : "_ZTIPK11EventTagMap#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11EventTagMap",
-   "name" : "const EventTagMap *",
-   "referenced_type" : "_ZTIK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIPK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK17AndroidLogEntry_t",
    "name" : "const AndroidLogEntry_t *",
    "referenced_type" : "_ZTIK17AndroidLogEntry_t",
@@ -2134,15 +1900,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP28android_log_context_internal",
-   "name" : "android_log_context_internal **",
-   "referenced_type" : "_ZTIP28android_log_context_internal#ODR:",
-   "self_type" : "_ZTIPP28android_log_context_internal#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
    "referenced_type" : "_ZTIPKc",
@@ -2339,11 +2096,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -2852,7 +2604,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/arm64_armv8-a/source-based/liblog.so.lsdump b/30/64/arm64_armv8-a/source-based/liblog.so.lsdump
index 93d3768..95bdf75 100644
--- a/30/64/arm64_armv8-a/source-based/liblog.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/liblog.so.lsdump
@@ -1327,7 +1327,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIi",
@@ -1351,7 +1351,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIl",
@@ -1363,7 +1363,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIl",
@@ -1375,7 +1375,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIi",
@@ -1387,7 +1387,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -1405,7 +1405,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -1522,7 +1522,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -1537,7 +1537,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -1663,228 +1663,12 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/log_event_list.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/log_event_list.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/log_event_write.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/log_event_write.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/log_time.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/log_time.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logd_reader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logd_reader.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logd_writer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logd_writer.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logger_name.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logger_name.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logger_read.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logger_read.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logger_write.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logger_write.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/properties.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/properties.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/log_event_list.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/log_event_list.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/log_event_write.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/log_event_write.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/log_time.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/log_time.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logd_reader.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logd_reader.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logd_writer.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logd_writer.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logger_write.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logger_write.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/properties.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/properties.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "pointer_types" :
@@ -2026,24 +1810,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK11EventTagMap",
-   "name" : "const EventTagMap *",
-   "referenced_type" : "_ZTIK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIPK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK11EventTagMap",
-   "name" : "const EventTagMap *",
-   "referenced_type" : "_ZTIK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIPK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK17AndroidLogEntry_t",
    "name" : "const AndroidLogEntry_t *",
    "referenced_type" : "_ZTIK17AndroidLogEntry_t",
@@ -2116,15 +1882,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP28android_log_context_internal",
-   "name" : "android_log_context_internal **",
-   "referenced_type" : "_ZTIP28android_log_context_internal#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/log_event_list.sdump",
-   "self_type" : "_ZTIPP28android_log_context_internal#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm64_armv8-a_static/obj/system/core/liblog/log_event_list.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
    "referenced_type" : "_ZTIPKc",
@@ -2321,11 +2078,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -2834,7 +2586,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/arm_armv7-a-neon/source-based/liblog.so.lsdump b/30/64/arm_armv7-a-neon/source-based/liblog.so.lsdump
index 5b24445..3e3856d 100644
--- a/30/64/arm_armv7-a-neon/source-based/liblog.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/liblog.so.lsdump
@@ -1346,7 +1346,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIi",
@@ -1370,7 +1370,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIl",
@@ -1382,7 +1382,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIl",
@@ -1394,7 +1394,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIi",
@@ -1406,7 +1406,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -1424,7 +1424,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -1541,7 +1541,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -1556,7 +1556,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -1682,228 +1682,12 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:",
-   "self_type" : "_ZTIRK8timespec#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/log_event_write.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/log_event_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/log_time.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/log_time.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_writer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logger_name.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logger_name.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logger_read.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logger_read.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logger_write.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logger_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/properties.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/properties.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/log_event_write.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/log_event_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/log_time.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/log_time.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_writer.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logd_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logger_write.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logger_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/properties.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/properties.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "pointer_types" :
@@ -2045,24 +1829,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11EventTagMap",
-   "name" : "const EventTagMap *",
-   "referenced_type" : "_ZTIK11EventTagMap#ODR:",
-   "self_type" : "_ZTIPK11EventTagMap#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11EventTagMap",
-   "name" : "const EventTagMap *",
-   "referenced_type" : "_ZTIK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIPK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv7-a-neon_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK17AndroidLogEntry_t",
    "name" : "const AndroidLogEntry_t *",
    "referenced_type" : "_ZTIK17AndroidLogEntry_t",
@@ -2135,15 +1901,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP28android_log_context_internal",
-   "name" : "android_log_context_internal **",
-   "referenced_type" : "_ZTIP28android_log_context_internal#ODR:",
-   "self_type" : "_ZTIPP28android_log_context_internal#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
    "referenced_type" : "_ZTIPKc",
@@ -2340,11 +2097,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -2853,7 +2605,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/arm_armv8-a/source-based/liblog.so.lsdump b/30/64/arm_armv8-a/source-based/liblog.so.lsdump
index 5de7f43..3e3856d 100644
--- a/30/64/arm_armv8-a/source-based/liblog.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/liblog.so.lsdump
@@ -1346,7 +1346,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIi",
@@ -1370,7 +1370,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIl",
@@ -1382,7 +1382,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIl",
@@ -1394,7 +1394,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIi",
@@ -1406,7 +1406,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -1424,7 +1424,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -1541,7 +1541,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -1556,7 +1556,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -1682,228 +1682,12 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:",
-   "self_type" : "_ZTIRK8timespec#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/log_event_write.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/log_event_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/log_time.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/log_time.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logd_reader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logd_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logd_writer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logd_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logger_name.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logger_name.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logger_read.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logger_read.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logger_write.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logger_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/properties.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/properties.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/log_event_write.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/log_event_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/log_time.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/log_time.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logd_reader.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logd_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logd_writer.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logd_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logger_write.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logger_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/properties.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/properties.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "pointer_types" :
@@ -2045,24 +1829,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11EventTagMap",
-   "name" : "const EventTagMap *",
-   "referenced_type" : "_ZTIK11EventTagMap#ODR:",
-   "self_type" : "_ZTIPK11EventTagMap#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11EventTagMap",
-   "name" : "const EventTagMap *",
-   "referenced_type" : "_ZTIK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIPK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_arm_armv8-a_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK17AndroidLogEntry_t",
    "name" : "const AndroidLogEntry_t *",
    "referenced_type" : "_ZTIK17AndroidLogEntry_t",
@@ -2135,15 +1901,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP28android_log_context_internal",
-   "name" : "android_log_context_internal **",
-   "referenced_type" : "_ZTIP28android_log_context_internal#ODR:",
-   "self_type" : "_ZTIPP28android_log_context_internal#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
    "referenced_type" : "_ZTIPKc",
@@ -2340,11 +2097,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -2853,7 +2605,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/x86/source-based/liblog.so.lsdump b/30/64/x86/source-based/liblog.so.lsdump
index c50e640..8315098 100644
--- a/30/64/x86/source-based/liblog.so.lsdump
+++ b/30/64/x86/source-based/liblog.so.lsdump
@@ -1345,7 +1345,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIi",
@@ -1369,7 +1369,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIl",
@@ -1381,7 +1381,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIl",
@@ -1393,7 +1393,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIi",
@@ -1405,7 +1405,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -1423,7 +1423,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -1540,7 +1540,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -1555,7 +1555,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -1681,228 +1681,12 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:",
-   "self_type" : "_ZTIRK8timespec#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/log_event_write.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/log_event_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/log_time.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/log_time.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_writer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logger_name.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logger_name.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logger_read.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logger_read.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logger_write.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logger_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/properties.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/properties.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/log_event_write.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/log_event_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/log_time.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/log_time.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_writer.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logd_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logger_write.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logger_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/properties.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/properties.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "pointer_types" :
@@ -2044,24 +1828,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11EventTagMap",
-   "name" : "const EventTagMap *",
-   "referenced_type" : "_ZTIK11EventTagMap#ODR:",
-   "self_type" : "_ZTIPK11EventTagMap#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11EventTagMap",
-   "name" : "const EventTagMap *",
-   "referenced_type" : "_ZTIK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIPK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK17AndroidLogEntry_t",
    "name" : "const AndroidLogEntry_t *",
    "referenced_type" : "_ZTIK17AndroidLogEntry_t",
@@ -2134,15 +1900,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP28android_log_context_internal",
-   "name" : "android_log_context_internal **",
-   "referenced_type" : "_ZTIP28android_log_context_internal#ODR:",
-   "self_type" : "_ZTIPP28android_log_context_internal#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
    "referenced_type" : "_ZTIPKc",
@@ -2339,11 +2096,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -2852,7 +2604,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/x86_64/source-based/liblog.so.lsdump b/30/64/x86_64/source-based/liblog.so.lsdump
index 053c4d0..d1e6db9 100644
--- a/30/64/x86_64/source-based/liblog.so.lsdump
+++ b/30/64/x86_64/source-based/liblog.so.lsdump
@@ -1326,7 +1326,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIi",
@@ -1350,7 +1350,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIl",
@@ -1362,7 +1362,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIl",
@@ -1374,7 +1374,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIi",
@@ -1386,7 +1386,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -1404,7 +1404,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -1521,7 +1521,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -1536,7 +1536,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -1662,228 +1662,12 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:",
-   "self_type" : "_ZTIRK8timespec#ODR:",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/log_event_write.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/log_event_write.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/log_time.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/log_time.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logd_reader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logd_reader.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logd_writer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logd_writer.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logger_name.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logger_name.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logger_read.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logger_read.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logger_write.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logger_write.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/properties.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/properties.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/log_event_write.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/log_event_write.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/log_time.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/log_time.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logd_reader.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logd_reader.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logd_writer.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logd_writer.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logger_write.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logger_write.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/properties.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/properties.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "pointer_types" :
@@ -2034,24 +1818,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK11EventTagMap",
-   "name" : "const EventTagMap *",
-   "referenced_type" : "_ZTIK11EventTagMap#ODR:",
-   "self_type" : "_ZTIPK11EventTagMap#ODR:",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK11EventTagMap",
-   "name" : "const EventTagMap *",
-   "referenced_type" : "_ZTIK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIPK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_64_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK17AndroidLogEntry_t",
    "name" : "const AndroidLogEntry_t *",
    "referenced_type" : "_ZTIK17AndroidLogEntry_t",
@@ -2124,15 +1890,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP28android_log_context_internal",
-   "name" : "android_log_context_internal **",
-   "referenced_type" : "_ZTIP28android_log_context_internal#ODR:",
-   "self_type" : "_ZTIPP28android_log_context_internal#ODR:",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
    "referenced_type" : "_ZTIPKc",
@@ -2329,11 +2086,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -2842,7 +2594,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",
diff --git a/30/64/x86_x86_64/source-based/liblog.so.lsdump b/30/64/x86_x86_64/source-based/liblog.so.lsdump
index 165991c..8315098 100644
--- a/30/64/x86_x86_64/source-based/liblog.so.lsdump
+++ b/30/64/x86_x86_64/source-based/liblog.so.lsdump
@@ -1345,7 +1345,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIi",
@@ -1369,7 +1369,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIl",
@@ -1381,7 +1381,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIl",
@@ -1393,7 +1393,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     }
    ],
    "return_type" : "_ZTIi",
@@ -1405,7 +1405,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -1423,7 +1423,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPc"
@@ -1540,7 +1540,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP6logger#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP6logger"
     },
     {
      "referenced_type" : "_ZTIm"
@@ -1555,7 +1555,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIP11logger_list#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logd_reader.sdump"
+     "referenced_type" : "_ZTIP11logger_list"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -1681,228 +1681,12 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:",
-   "self_type" : "_ZTIRK8timespec#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/log_event_write.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/log_event_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/log_time.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/log_time.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logd_reader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logd_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logd_writer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logd_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logger_name.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logger_name.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logger_read.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logger_read.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logger_write.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logger_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRK8timespec",
-   "name" : "const timespec &",
-   "referenced_type" : "_ZTIK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/properties.sdump",
-   "self_type" : "_ZTIRK8timespec#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/properties.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_time.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/log_event_write.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/log_event_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/log_time.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/log_time.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logd_reader.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logd_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logd_writer.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logd_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logger_write.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logger_write.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logprint.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/logprint.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/pmsg_reader.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/pmsg_writer.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/properties.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/properties.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "pointer_types" :
@@ -2044,24 +1828,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11EventTagMap",
-   "name" : "const EventTagMap *",
-   "referenced_type" : "_ZTIK11EventTagMap#ODR:",
-   "self_type" : "_ZTIPK11EventTagMap#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/logprint.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11EventTagMap",
-   "name" : "const EventTagMap *",
-   "referenced_type" : "_ZTIK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/event_tag_map.sdump",
-   "self_type" : "_ZTIPK11EventTagMap#ODR:out/soong/.intermediates/system/core/liblog/liblog/android_x86_x86_64_static/obj/system/core/liblog/event_tag_map.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK17AndroidLogEntry_t",
    "name" : "const AndroidLogEntry_t *",
    "referenced_type" : "_ZTIK17AndroidLogEntry_t",
@@ -2134,15 +1900,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP28android_log_context_internal",
-   "name" : "android_log_context_internal **",
-   "referenced_type" : "_ZTIP28android_log_context_internal#ODR:",
-   "self_type" : "_ZTIPP28android_log_context_internal#ODR:",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
    "referenced_type" : "_ZTIPKc",
@@ -2339,11 +2096,6 @@
      "field_name" : "uid",
      "field_offset" : 192,
      "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "_ZTIA0_c"
     }
    ],
    "linker_set_key" : "_ZTI12logger_entry",
@@ -2852,7 +2604,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:81:3)",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:77:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN7log_msgUt_E",
    "self_type" : "_ZTIN7log_msgUt_E",