Revert "Cleanup references to system/core/liblog -> system/logging/liblog"

This reverts commit da37adb06b5fc2e4b5296fcfa6ad87156a3c123e.

Reason for revert: The dumps for previous releases don't need to be updated with the latest code. The modification may conflict with the upstream.

Change-Id: I7cae0e1c2cafe8dfef9594f8cf10b965909c1d2e

8 files changed, 184 insertions, 184 deletions

diff --git a/30/32/arm_armv7-a-neon/source-based/libandroidio.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libandroidio.so.lsdump
index 722b536..c0262a2 100644
--- a/30/32/arm_armv7-a-neon/source-based/libandroidio.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libandroidio.so.lsdump
@@ -224,7 +224,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA5121_h",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 2,
@@ -292,7 +292,7 @@
    "name" : "char []",
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA_c",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   }
  ],
  "builtin_types" :
@@ -540,7 +540,7 @@
    "referenced_type" : "_ZTI19AndroidEventLogType",
    "self_type" : "_ZTI19AndroidEventLogType",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -589,7 +589,7 @@
    "referenced_type" : "_ZTI19android_LogPriority",
    "self_type" : "_ZTI19android_LogPriority",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -704,7 +704,7 @@
    "referenced_type" : "_ZTI6log_id",
    "self_type" : "_ZTI6log_id",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1773,7 +1773,7 @@
    "referenced_type" : "_ZTIK7log_msg",
    "self_type" : "_ZTIRK7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1782,7 +1782,7 @@
    "referenced_type" : "_ZTIK8log_time",
    "self_type" : "_ZTIRK8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1791,7 +1791,7 @@
    "referenced_type" : "_ZTIK8timespec",
    "self_type" : "_ZTIRK8timespec",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2627,7 +2627,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTIP7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2645,7 +2645,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTIP8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2816,7 +2816,7 @@
    "referenced_type" : "_ZTIK7log_msg",
    "self_type" : "_ZTIPK7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2825,7 +2825,7 @@
    "referenced_type" : "_ZTIK8log_time",
    "self_type" : "_ZTIPK8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4241,7 +4241,7 @@
    "name" : "char const[]",
    "referenced_type" : "_ZTIA_c",
    "self_type" : "_ZTIA_Kc",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4261,7 +4261,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTIK7log_msg",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -4271,7 +4271,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTIK8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4281,7 +4281,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTIK8timespec",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -5467,7 +5467,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -6014,7 +6014,7 @@
    "referenced_type" : "_ZTI12logger_entry",
    "self_type" : "_ZTI12logger_entry",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -6364,7 +6364,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTI21__android_log_message",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -6900,7 +6900,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTI7log_msg",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -6957,7 +6957,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTI8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -7626,12 +7626,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:77: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",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
diff --git a/30/32/x86/source-based/libandroidio.so.lsdump b/30/32/x86/source-based/libandroidio.so.lsdump
index da4dcde..b8123b1 100644
--- a/30/32/x86/source-based/libandroidio.so.lsdump
+++ b/30/32/x86/source-based/libandroidio.so.lsdump
@@ -278,7 +278,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA5121_h",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -418,7 +418,7 @@
    "name" : "char []",
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA_c",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   }
  ],
  "builtin_types" :
@@ -664,7 +664,7 @@
    "referenced_type" : "_ZTI19AndroidEventLogType",
    "self_type" : "_ZTI19AndroidEventLogType",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -713,7 +713,7 @@
    "referenced_type" : "_ZTI19android_LogPriority",
    "self_type" : "_ZTI19android_LogPriority",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -921,7 +921,7 @@
    "referenced_type" : "_ZTI6log_id",
    "self_type" : "_ZTI6log_id",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1913,7 +1913,7 @@
    "referenced_type" : "_ZTIK7log_msg",
    "self_type" : "_ZTIRK7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1922,7 +1922,7 @@
    "referenced_type" : "_ZTIK8log_time",
    "self_type" : "_ZTIRK8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1931,7 +1931,7 @@
    "referenced_type" : "_ZTIK8timespec",
    "self_type" : "_ZTIRK8timespec",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2794,7 +2794,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTIP7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2812,7 +2812,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTIP8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2974,7 +2974,7 @@
    "referenced_type" : "_ZTIK7log_msg",
    "self_type" : "_ZTIPK7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2983,7 +2983,7 @@
    "referenced_type" : "_ZTIK8log_time",
    "self_type" : "_ZTIPK8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4390,7 +4390,7 @@
    "name" : "char const[]",
    "referenced_type" : "_ZTIA_c",
    "self_type" : "_ZTIA_Kc",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4410,7 +4410,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTIK7log_msg",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -4420,7 +4420,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTIK8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4430,7 +4430,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTIK8timespec",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -5606,7 +5606,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -6384,7 +6384,7 @@
    "referenced_type" : "_ZTI12logger_entry",
    "self_type" : "_ZTI12logger_entry",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -7325,7 +7325,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTI21__android_log_message",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -7976,7 +7976,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTI7log_msg",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -8033,7 +8033,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTI8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -8680,12 +8680,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:77: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",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
diff --git a/30/64/arm64_armv8-a/source-based/libandroidio.so.lsdump b/30/64/arm64_armv8-a/source-based/libandroidio.so.lsdump
index 3b3a58d..67c4e3d 100644
--- a/30/64/arm64_armv8-a/source-based/libandroidio.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libandroidio.so.lsdump
@@ -233,7 +233,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA5121_h",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -283,7 +283,7 @@
    "name" : "char []",
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA_c",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   }
  ],
  "builtin_types" :
@@ -550,7 +550,7 @@
    "referenced_type" : "_ZTI19AndroidEventLogType",
    "self_type" : "_ZTI19AndroidEventLogType",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -599,7 +599,7 @@
    "referenced_type" : "_ZTI19android_LogPriority",
    "self_type" : "_ZTI19android_LogPriority",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -714,7 +714,7 @@
    "referenced_type" : "_ZTI6log_id",
    "self_type" : "_ZTI6log_id",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1706,7 +1706,7 @@
    "referenced_type" : "_ZTIK7log_msg",
    "self_type" : "_ZTIRK7log_msg",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -1715,7 +1715,7 @@
    "referenced_type" : "_ZTIK8log_time",
    "self_type" : "_ZTIRK8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1724,7 +1724,7 @@
    "referenced_type" : "_ZTIK8timespec",
    "self_type" : "_ZTIRK8timespec",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2614,7 +2614,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTIP7log_msg",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2632,7 +2632,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTIP8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2794,7 +2794,7 @@
    "referenced_type" : "_ZTIK7log_msg",
    "self_type" : "_ZTIPK7log_msg",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2803,7 +2803,7 @@
    "referenced_type" : "_ZTIK8log_time",
    "self_type" : "_ZTIPK8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -4291,7 +4291,7 @@
    "name" : "char const[]",
    "referenced_type" : "_ZTIA_c",
    "self_type" : "_ZTIA_Kc",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -4311,7 +4311,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTIK7log_msg",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -4321,7 +4321,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTIK8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -4331,7 +4331,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTIK8timespec",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -5567,7 +5567,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -6075,7 +6075,7 @@
    "referenced_type" : "_ZTI12logger_entry",
    "self_type" : "_ZTI12logger_entry",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -6523,7 +6523,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTI21__android_log_message",
    "size" : 48,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 8,
@@ -6973,7 +6973,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTI7log_msg",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -7030,7 +7030,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTI8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -7610,12 +7610,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:77: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",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
diff --git a/30/64/arm_armv7-a-neon/source-based/libandroidio.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libandroidio.so.lsdump
index 722b536..c0262a2 100644
--- a/30/64/arm_armv7-a-neon/source-based/libandroidio.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libandroidio.so.lsdump
@@ -224,7 +224,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA5121_h",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 2,
@@ -292,7 +292,7 @@
    "name" : "char []",
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA_c",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   }
  ],
  "builtin_types" :
@@ -540,7 +540,7 @@
    "referenced_type" : "_ZTI19AndroidEventLogType",
    "self_type" : "_ZTI19AndroidEventLogType",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -589,7 +589,7 @@
    "referenced_type" : "_ZTI19android_LogPriority",
    "self_type" : "_ZTI19android_LogPriority",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -704,7 +704,7 @@
    "referenced_type" : "_ZTI6log_id",
    "self_type" : "_ZTI6log_id",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1773,7 +1773,7 @@
    "referenced_type" : "_ZTIK7log_msg",
    "self_type" : "_ZTIRK7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1782,7 +1782,7 @@
    "referenced_type" : "_ZTIK8log_time",
    "self_type" : "_ZTIRK8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1791,7 +1791,7 @@
    "referenced_type" : "_ZTIK8timespec",
    "self_type" : "_ZTIRK8timespec",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2627,7 +2627,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTIP7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2645,7 +2645,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTIP8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2816,7 +2816,7 @@
    "referenced_type" : "_ZTIK7log_msg",
    "self_type" : "_ZTIPK7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2825,7 +2825,7 @@
    "referenced_type" : "_ZTIK8log_time",
    "self_type" : "_ZTIPK8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4241,7 +4241,7 @@
    "name" : "char const[]",
    "referenced_type" : "_ZTIA_c",
    "self_type" : "_ZTIA_Kc",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4261,7 +4261,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTIK7log_msg",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -4271,7 +4271,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTIK8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4281,7 +4281,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTIK8timespec",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -5467,7 +5467,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -6014,7 +6014,7 @@
    "referenced_type" : "_ZTI12logger_entry",
    "self_type" : "_ZTI12logger_entry",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -6364,7 +6364,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTI21__android_log_message",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -6900,7 +6900,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTI7log_msg",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -6957,7 +6957,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTI8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -7626,12 +7626,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:77: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",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
diff --git a/30/64/arm_armv8-a/source-based/libandroidio.so.lsdump b/30/64/arm_armv8-a/source-based/libandroidio.so.lsdump
index 722b536..c0262a2 100644
--- a/30/64/arm_armv8-a/source-based/libandroidio.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libandroidio.so.lsdump
@@ -224,7 +224,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA5121_h",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 2,
@@ -292,7 +292,7 @@
    "name" : "char []",
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA_c",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   }
  ],
  "builtin_types" :
@@ -540,7 +540,7 @@
    "referenced_type" : "_ZTI19AndroidEventLogType",
    "self_type" : "_ZTI19AndroidEventLogType",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -589,7 +589,7 @@
    "referenced_type" : "_ZTI19android_LogPriority",
    "self_type" : "_ZTI19android_LogPriority",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -704,7 +704,7 @@
    "referenced_type" : "_ZTI6log_id",
    "self_type" : "_ZTI6log_id",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1773,7 +1773,7 @@
    "referenced_type" : "_ZTIK7log_msg",
    "self_type" : "_ZTIRK7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1782,7 +1782,7 @@
    "referenced_type" : "_ZTIK8log_time",
    "self_type" : "_ZTIRK8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1791,7 +1791,7 @@
    "referenced_type" : "_ZTIK8timespec",
    "self_type" : "_ZTIRK8timespec",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2627,7 +2627,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTIP7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2645,7 +2645,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTIP8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2816,7 +2816,7 @@
    "referenced_type" : "_ZTIK7log_msg",
    "self_type" : "_ZTIPK7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2825,7 +2825,7 @@
    "referenced_type" : "_ZTIK8log_time",
    "self_type" : "_ZTIPK8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4241,7 +4241,7 @@
    "name" : "char const[]",
    "referenced_type" : "_ZTIA_c",
    "self_type" : "_ZTIA_Kc",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4261,7 +4261,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTIK7log_msg",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -4271,7 +4271,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTIK8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4281,7 +4281,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTIK8timespec",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -5467,7 +5467,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -6014,7 +6014,7 @@
    "referenced_type" : "_ZTI12logger_entry",
    "self_type" : "_ZTI12logger_entry",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -6364,7 +6364,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTI21__android_log_message",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -6900,7 +6900,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTI7log_msg",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -6957,7 +6957,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTI8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -7626,12 +7626,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:77: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",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
diff --git a/30/64/x86/source-based/libandroidio.so.lsdump b/30/64/x86/source-based/libandroidio.so.lsdump
index da4dcde..b8123b1 100644
--- a/30/64/x86/source-based/libandroidio.so.lsdump
+++ b/30/64/x86/source-based/libandroidio.so.lsdump
@@ -278,7 +278,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA5121_h",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -418,7 +418,7 @@
    "name" : "char []",
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA_c",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   }
  ],
  "builtin_types" :
@@ -664,7 +664,7 @@
    "referenced_type" : "_ZTI19AndroidEventLogType",
    "self_type" : "_ZTI19AndroidEventLogType",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -713,7 +713,7 @@
    "referenced_type" : "_ZTI19android_LogPriority",
    "self_type" : "_ZTI19android_LogPriority",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -921,7 +921,7 @@
    "referenced_type" : "_ZTI6log_id",
    "self_type" : "_ZTI6log_id",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1913,7 +1913,7 @@
    "referenced_type" : "_ZTIK7log_msg",
    "self_type" : "_ZTIRK7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1922,7 +1922,7 @@
    "referenced_type" : "_ZTIK8log_time",
    "self_type" : "_ZTIRK8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1931,7 +1931,7 @@
    "referenced_type" : "_ZTIK8timespec",
    "self_type" : "_ZTIRK8timespec",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2794,7 +2794,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTIP7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2812,7 +2812,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTIP8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2974,7 +2974,7 @@
    "referenced_type" : "_ZTIK7log_msg",
    "self_type" : "_ZTIPK7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2983,7 +2983,7 @@
    "referenced_type" : "_ZTIK8log_time",
    "self_type" : "_ZTIPK8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4390,7 +4390,7 @@
    "name" : "char const[]",
    "referenced_type" : "_ZTIA_c",
    "self_type" : "_ZTIA_Kc",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4410,7 +4410,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTIK7log_msg",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -4420,7 +4420,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTIK8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4430,7 +4430,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTIK8timespec",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -5606,7 +5606,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -6384,7 +6384,7 @@
    "referenced_type" : "_ZTI12logger_entry",
    "self_type" : "_ZTI12logger_entry",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -7325,7 +7325,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTI21__android_log_message",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -7976,7 +7976,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTI7log_msg",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -8033,7 +8033,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTI8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -8680,12 +8680,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:77: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",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
diff --git a/30/64/x86_64/source-based/libandroidio.so.lsdump b/30/64/x86_64/source-based/libandroidio.so.lsdump
index 289f950..f06d493 100644
--- a/30/64/x86_64/source-based/libandroidio.so.lsdump
+++ b/30/64/x86_64/source-based/libandroidio.so.lsdump
@@ -260,7 +260,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA5121_h",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -400,7 +400,7 @@
    "name" : "char []",
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA_c",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   }
  ],
  "builtin_types" :
@@ -665,7 +665,7 @@
    "referenced_type" : "_ZTI19AndroidEventLogType",
    "self_type" : "_ZTI19AndroidEventLogType",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -714,7 +714,7 @@
    "referenced_type" : "_ZTI19android_LogPriority",
    "self_type" : "_ZTI19android_LogPriority",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -938,7 +938,7 @@
    "referenced_type" : "_ZTI6log_id",
    "self_type" : "_ZTI6log_id",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1930,7 +1930,7 @@
    "referenced_type" : "_ZTIK7log_msg",
    "self_type" : "_ZTIRK7log_msg",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -1939,7 +1939,7 @@
    "referenced_type" : "_ZTIK8log_time",
    "self_type" : "_ZTIRK8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1948,7 +1948,7 @@
    "referenced_type" : "_ZTIK8timespec",
    "self_type" : "_ZTIRK8timespec",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2874,7 +2874,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTIP7log_msg",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2892,7 +2892,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTIP8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3054,7 +3054,7 @@
    "referenced_type" : "_ZTIK7log_msg",
    "self_type" : "_ZTIPK7log_msg",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -3063,7 +3063,7 @@
    "referenced_type" : "_ZTIK8log_time",
    "self_type" : "_ZTIPK8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -4542,7 +4542,7 @@
    "name" : "char const[]",
    "referenced_type" : "_ZTIA_c",
    "self_type" : "_ZTIA_Kc",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -4562,7 +4562,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTIK7log_msg",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -4572,7 +4572,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTIK8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -4582,7 +4582,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTIK8timespec",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -5808,7 +5808,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -6605,7 +6605,7 @@
    "referenced_type" : "_ZTI12logger_entry",
    "self_type" : "_ZTI12logger_entry",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -7550,7 +7550,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTI21__android_log_message",
    "size" : 48,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 8,
@@ -8221,7 +8221,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTI7log_msg",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -8278,7 +8278,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTI8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -8930,12 +8930,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:77: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",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
diff --git a/30/64/x86_x86_64/source-based/libandroidio.so.lsdump b/30/64/x86_x86_64/source-based/libandroidio.so.lsdump
index da4dcde..b8123b1 100644
--- a/30/64/x86_x86_64/source-based/libandroidio.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libandroidio.so.lsdump
@@ -278,7 +278,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA5121_h",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -418,7 +418,7 @@
    "name" : "char []",
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA_c",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   }
  ],
  "builtin_types" :
@@ -664,7 +664,7 @@
    "referenced_type" : "_ZTI19AndroidEventLogType",
    "self_type" : "_ZTI19AndroidEventLogType",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -713,7 +713,7 @@
    "referenced_type" : "_ZTI19android_LogPriority",
    "self_type" : "_ZTI19android_LogPriority",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -921,7 +921,7 @@
    "referenced_type" : "_ZTI6log_id",
    "self_type" : "_ZTI6log_id",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1913,7 +1913,7 @@
    "referenced_type" : "_ZTIK7log_msg",
    "self_type" : "_ZTIRK7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1922,7 +1922,7 @@
    "referenced_type" : "_ZTIK8log_time",
    "self_type" : "_ZTIRK8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1931,7 +1931,7 @@
    "referenced_type" : "_ZTIK8timespec",
    "self_type" : "_ZTIRK8timespec",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2794,7 +2794,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTIP7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2812,7 +2812,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTIP8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2974,7 +2974,7 @@
    "referenced_type" : "_ZTIK7log_msg",
    "self_type" : "_ZTIPK7log_msg",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2983,7 +2983,7 @@
    "referenced_type" : "_ZTIK8log_time",
    "self_type" : "_ZTIPK8log_time",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4390,7 +4390,7 @@
    "name" : "char const[]",
    "referenced_type" : "_ZTIA_c",
    "self_type" : "_ZTIA_Kc",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4410,7 +4410,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTIK7log_msg",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -4420,7 +4420,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTIK8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -4430,7 +4430,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTIK8timespec",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -5606,7 +5606,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -6384,7 +6384,7 @@
    "referenced_type" : "_ZTI12logger_entry",
    "self_type" : "_ZTI12logger_entry",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -7325,7 +7325,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTI21__android_log_message",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -7976,7 +7976,7 @@
    "referenced_type" : "_ZTI7log_msg",
    "self_type" : "_ZTI7log_msg",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -8033,7 +8033,7 @@
    "referenced_type" : "_ZTI8log_time",
    "self_type" : "_ZTI8log_time",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -8680,12 +8680,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN7log_msgUt_E",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:77: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",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,