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

This reverts commit 507cacd73430333c24d6118992251fb8b08b1151.

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: Id5fbfeffe63f83832befa223c73108650772d90e
diff --git a/29/32/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
index ba15e1b..f0a641d 100644
--- a/29/32/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
+++ b/29/32/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
@@ -105,7 +105,7 @@
    "name" : "char []",
    "referenced_type" : "type-143",
    "self_type" : "type-814",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -218,7 +218,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-2770",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1026,7 +1026,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2788",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -2563,7 +2563,7 @@
    "referenced_type" : "type-2746",
    "self_type" : "type-2746",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -5037,7 +5037,7 @@
    "referenced_type" : "type-2747",
    "self_type" : "type-2747",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -15938,7 +15938,7 @@
    "referenced_type" : "type-2784",
    "self_type" : "type-2786",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -15947,7 +15947,7 @@
    "referenced_type" : "type-2753",
    "self_type" : "type-2755",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16127,7 +16127,7 @@
    "referenced_type" : "type-2164",
    "self_type" : "type-2176",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16136,7 +16136,7 @@
    "referenced_type" : "type-2359",
    "self_type" : "type-2358",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16145,7 +16145,7 @@
    "referenced_type" : "type-2394",
    "self_type" : "type-2396",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16154,7 +16154,7 @@
    "referenced_type" : "type-2600",
    "self_type" : "type-2602",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16163,7 +16163,7 @@
    "referenced_type" : "type-2749",
    "self_type" : "type-2752",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16172,7 +16172,7 @@
    "referenced_type" : "type-2764",
    "self_type" : "type-2763",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -18704,7 +18704,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-362",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21215,7 +21215,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-162",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21260,7 +21260,7 @@
    "referenced_type" : "type-2784",
    "self_type" : "type-2785",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21269,7 +21269,7 @@
    "referenced_type" : "type-2753",
    "self_type" : "type-2754",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21521,7 +21521,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2787",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21530,7 +21530,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2751",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25803,7 +25803,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-814",
    "self_type" : "type-2756",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28785,7 +28785,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-163",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28855,7 +28855,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2784",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28865,7 +28865,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2753",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -29075,7 +29075,7 @@
    "referenced_type" : "type-2165",
    "self_type" : "type-2164",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29085,7 +29085,7 @@
    "referenced_type" : "type-2360",
    "self_type" : "type-2359",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29095,7 +29095,7 @@
    "referenced_type" : "type-2395",
    "self_type" : "type-2394",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29105,7 +29105,7 @@
    "referenced_type" : "type-2601",
    "self_type" : "type-2600",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29115,7 +29115,7 @@
    "referenced_type" : "type-2750",
    "self_type" : "type-2749",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29125,7 +29125,7 @@
    "referenced_type" : "type-2765",
    "self_type" : "type-2764",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -61062,7 +61062,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2768",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -61095,14 +61095,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2769",
    "self_type" : "type-2769",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -61123,7 +61123,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2748",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -61170,7 +61170,7 @@
    "referenced_type" : "type-2757",
    "self_type" : "type-2757",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -61222,7 +61222,7 @@
    "referenced_type" : "type-2759",
    "self_type" : "type-2759",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -61274,7 +61274,7 @@
    "referenced_type" : "type-2761",
    "self_type" : "type-2761",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -61331,7 +61331,7 @@
    "referenced_type" : "type-2766",
    "self_type" : "type-2766",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/32/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
index a500095..c3d2ba9 100644
--- a/29/32/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
+++ b/29/32/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
@@ -105,7 +105,7 @@
    "name" : "char []",
    "referenced_type" : "type-143",
    "self_type" : "type-814",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -218,7 +218,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-2770",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1062,7 +1062,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2788",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -2599,7 +2599,7 @@
    "referenced_type" : "type-2746",
    "self_type" : "type-2746",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -5073,7 +5073,7 @@
    "referenced_type" : "type-2747",
    "self_type" : "type-2747",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -16046,7 +16046,7 @@
    "referenced_type" : "type-2784",
    "self_type" : "type-2786",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -16055,7 +16055,7 @@
    "referenced_type" : "type-2753",
    "self_type" : "type-2755",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16235,7 +16235,7 @@
    "referenced_type" : "type-2164",
    "self_type" : "type-2176",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16244,7 +16244,7 @@
    "referenced_type" : "type-2359",
    "self_type" : "type-2358",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16253,7 +16253,7 @@
    "referenced_type" : "type-2394",
    "self_type" : "type-2396",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16262,7 +16262,7 @@
    "referenced_type" : "type-2600",
    "self_type" : "type-2602",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16271,7 +16271,7 @@
    "referenced_type" : "type-2749",
    "self_type" : "type-2752",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16280,7 +16280,7 @@
    "referenced_type" : "type-2764",
    "self_type" : "type-2763",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -18812,7 +18812,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-362",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21323,7 +21323,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-162",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21368,7 +21368,7 @@
    "referenced_type" : "type-2784",
    "self_type" : "type-2785",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21377,7 +21377,7 @@
    "referenced_type" : "type-2753",
    "self_type" : "type-2754",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21629,7 +21629,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2787",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21638,7 +21638,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2751",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25911,7 +25911,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-814",
    "self_type" : "type-2756",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28893,7 +28893,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-163",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28963,7 +28963,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2784",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28973,7 +28973,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2753",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -29183,7 +29183,7 @@
    "referenced_type" : "type-2165",
    "self_type" : "type-2164",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29193,7 +29193,7 @@
    "referenced_type" : "type-2360",
    "self_type" : "type-2359",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29203,7 +29203,7 @@
    "referenced_type" : "type-2395",
    "self_type" : "type-2394",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29213,7 +29213,7 @@
    "referenced_type" : "type-2601",
    "self_type" : "type-2600",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29223,7 +29223,7 @@
    "referenced_type" : "type-2750",
    "self_type" : "type-2749",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29233,7 +29233,7 @@
    "referenced_type" : "type-2765",
    "self_type" : "type-2764",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -61170,7 +61170,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2768",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -61203,14 +61203,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2769",
    "self_type" : "type-2769",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -61231,7 +61231,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2748",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -61278,7 +61278,7 @@
    "referenced_type" : "type-2757",
    "self_type" : "type-2757",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -61330,7 +61330,7 @@
    "referenced_type" : "type-2759",
    "self_type" : "type-2759",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -61382,7 +61382,7 @@
    "referenced_type" : "type-2761",
    "self_type" : "type-2761",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -61439,7 +61439,7 @@
    "referenced_type" : "type-2766",
    "self_type" : "type-2766",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/32/arm_armv7-a-neon/source-based/libRS.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libRS.so.lsdump
index 6157374..ae88b06 100644
--- a/29/32/arm_armv7-a-neon/source-based/libRS.so.lsdump
+++ b/29/32/arm_armv7-a-neon/source-based/libRS.so.lsdump
@@ -389,7 +389,7 @@
    "name" : "char []",
    "referenced_type" : "type-18",
    "self_type" : "type-4053",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 2,
@@ -622,7 +622,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-4066",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1403,7 +1403,7 @@
    "referenced_type" : "type-4071",
    "self_type" : "type-4071",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "AndroidEventLogType"
   },
@@ -4671,7 +4671,7 @@
    "referenced_type" : "type-4032",
    "self_type" : "type-4032",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "android_LogPriority"
   },
@@ -4805,7 +4805,7 @@
    "referenced_type" : "type-4033",
    "self_type" : "type-4033",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "log_id"
   },
@@ -16904,7 +16904,7 @@
    "referenced_type" : "type-4067",
    "self_type" : "type-4069",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -16913,7 +16913,7 @@
    "referenced_type" : "type-4050",
    "self_type" : "type-4052",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -17867,7 +17867,7 @@
    "referenced_type" : "type-4046",
    "self_type" : "type-4049",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -17876,7 +17876,7 @@
    "referenced_type" : "type-6934",
    "self_type" : "type-6935",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "linker_set_key" : "const uniform_int_distribution<_IntType> &",
@@ -20769,7 +20769,7 @@
    "referenced_type" : "type-4067",
    "self_type" : "type-4068",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20778,7 +20778,7 @@
    "referenced_type" : "type-4050",
    "self_type" : "type-4051",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -22947,7 +22947,7 @@
    "referenced_type" : "type-4064",
    "self_type" : "type-4070",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -22956,7 +22956,7 @@
    "referenced_type" : "type-4045",
    "self_type" : "type-4048",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -27650,7 +27650,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-4053",
    "self_type" : "type-4054",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28644,7 +28644,7 @@
    "referenced_type" : "type-4064",
    "self_type" : "type-4067",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28654,7 +28654,7 @@
    "referenced_type" : "type-4045",
    "self_type" : "type-4050",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -30866,7 +30866,7 @@
    "referenced_type" : "type-2487",
    "self_type" : "type-4046",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -30876,7 +30876,7 @@
    "referenced_type" : "type-6928",
    "self_type" : "type-6934",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -42221,7 +42221,7 @@
    "referenced_type" : "type-4064",
    "self_type" : "type-4064",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -42254,14 +42254,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-4065",
    "self_type" : "type-4065",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -42282,7 +42282,7 @@
    "referenced_type" : "type-4045",
    "self_type" : "type-4045",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -42329,7 +42329,7 @@
    "referenced_type" : "type-4055",
    "self_type" : "type-4055",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -42381,7 +42381,7 @@
    "referenced_type" : "type-4057",
    "self_type" : "type-4057",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -42433,7 +42433,7 @@
    "referenced_type" : "type-4060",
    "self_type" : "type-4060",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -42490,7 +42490,7 @@
    "referenced_type" : "type-4062",
    "self_type" : "type-4062",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/32/arm_armv7-a-neon/source-based/liblog.so.lsdump b/29/32/arm_armv7-a-neon/source-based/liblog.so.lsdump
index d6bdca5..d5d7aad 100644
--- a/29/32/arm_armv7-a-neon/source-based/liblog.so.lsdump
+++ b/29/32/arm_armv7-a-neon/source-based/liblog.so.lsdump
@@ -6,7 +6,7 @@
    "name" : "char []",
    "referenced_type" : "type-9",
    "self_type" : "type-8",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -15,7 +15,7 @@
    "referenced_type" : "type-86",
    "self_type" : "type-85",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   }
  ],
  "builtin_types" :
@@ -378,7 +378,7 @@
    "referenced_type" : "type-126",
    "self_type" : "type-126",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -468,7 +468,7 @@
    "referenced_type" : "type-64",
    "self_type" : "type-64",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidLogPrintFormat"
   },
@@ -518,7 +518,7 @@
    "referenced_type" : "type-1",
    "self_type" : "type-1",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -572,7 +572,7 @@
    "referenced_type" : "type-104",
    "self_type" : "type-104",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -626,7 +626,7 @@
    "referenced_type" : "type-32",
    "self_type" : "type-32",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_id.h",
+   "source_file" : "/system/core/liblog/include/log/log_id.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   }
@@ -661,7 +661,7 @@
    "referenced_type" : "type-133",
    "return_type" : "type-6",
    "self_type" : "type-133",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "functions" :
@@ -682,7 +682,7 @@
     }
    ],
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bswrite",
@@ -697,7 +697,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_btwrite",
@@ -718,7 +718,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_buf_print",
@@ -739,7 +739,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_buf_write",
@@ -760,7 +760,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bwrite",
@@ -778,13 +778,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_close",
    "linker_set_key" : "__android_log_close",
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_error_write",
@@ -808,13 +808,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_safetynet.h"
+   "source_file" : "/system/core/liblog/include/log/log_safetynet.h"
   },
   {
    "function_name" : "__android_log_is_debuggable",
    "linker_set_key" : "__android_log_is_debuggable",
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_properties.h"
+   "source_file" : "/system/core/liblog/include/log/log_properties.h"
   },
   {
    "function_name" : "__android_log_is_loggable",
@@ -832,7 +832,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_main.h"
+   "source_file" : "/system/core/liblog/include/log/log_main.h"
   },
   {
    "function_name" : "__android_log_is_loggable_len",
@@ -853,7 +853,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_main.h"
+   "source_file" : "/system/core/liblog/include/log/log_main.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_read",
@@ -877,7 +877,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_write",
@@ -901,7 +901,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_print",
@@ -919,13 +919,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_security",
    "linker_set_key" : "__android_log_security",
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_security_bswrite",
@@ -940,7 +940,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_vprint",
@@ -961,7 +961,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write",
@@ -979,7 +979,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_logger_get_buffer_size",
@@ -991,7 +991,7 @@
     }
    ],
    "return_type" : "type-40",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_logger_property_get_bool",
@@ -1006,7 +1006,7 @@
     }
    ],
    "return_type" : "type-3",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_destroy",
@@ -1018,7 +1018,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_id_to_name",
@@ -1030,7 +1030,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_log_parser_reset",
@@ -1048,7 +1048,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_processBinaryLogBuffer",
@@ -1072,7 +1072,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_processLogBuffer",
@@ -1087,7 +1087,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_read_next",
@@ -1099,7 +1099,7 @@
     }
    ],
    "return_type" : "type-143",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_reset",
@@ -1111,7 +1111,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_float32",
@@ -1126,7 +1126,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int32",
@@ -1141,7 +1141,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int64",
@@ -1156,7 +1156,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list",
@@ -1171,7 +1171,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_begin",
@@ -1183,7 +1183,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_buffer",
@@ -1198,7 +1198,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_write_list_end",
@@ -1210,7 +1210,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8",
@@ -1225,7 +1225,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8_len",
@@ -1243,7 +1243,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_logger_clear",
@@ -1255,7 +1255,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_id",
@@ -1267,7 +1267,7 @@
     }
    ],
    "return_type" : "type-32",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_readable_size",
@@ -1279,7 +1279,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_size",
@@ -1291,7 +1291,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_version",
@@ -1303,7 +1303,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_prune_list",
@@ -1321,7 +1321,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_statistics",
@@ -1339,7 +1339,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc",
@@ -1357,7 +1357,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc_time",
@@ -1375,7 +1375,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_free",
@@ -1387,7 +1387,7 @@
     }
    ],
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_open",
@@ -1408,7 +1408,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_read",
@@ -1423,7 +1423,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_open",
@@ -1438,7 +1438,7 @@
     }
    ],
    "return_type" : "type-37",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_log_size",
@@ -1453,7 +1453,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_prune_list",
@@ -1471,7 +1471,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_lookupEventTagNum",
@@ -1492,7 +1492,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "android_name_to_log_id",
@@ -1504,7 +1504,7 @@
     }
    ],
    "return_type" : "type-104",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_openEventTagMap",
@@ -1516,7 +1516,7 @@
     }
    ],
    "return_type" : "type-81",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "create_android_log_parser",
@@ -1531,7 +1531,7 @@
     }
    ],
    "return_type" : "type-147",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "create_android_logger",
@@ -1543,7 +1543,7 @@
     }
    ],
    "return_type" : "type-147",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "global_vars" : [],
@@ -1556,7 +1556,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-154",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1565,7 +1565,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-115",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1574,7 +1574,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-27",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1583,7 +1583,7 @@
    "referenced_type" : "type-108",
    "self_type" : "type-110",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1592,7 +1592,7 @@
    "referenced_type" : "type-119",
    "self_type" : "type-121",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1601,7 +1601,7 @@
    "referenced_type" : "type-129",
    "self_type" : "type-132",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1610,7 +1610,7 @@
    "referenced_type" : "type-155",
    "self_type" : "type-157",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1619,7 +1619,7 @@
    "referenced_type" : "type-173",
    "self_type" : "type-175",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1628,7 +1628,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-22",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1637,7 +1637,7 @@
    "referenced_type" : "type-205",
    "self_type" : "type-207",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1646,7 +1646,7 @@
    "referenced_type" : "type-213",
    "self_type" : "type-215",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1655,7 +1655,7 @@
    "referenced_type" : "type-245",
    "self_type" : "type-247",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1664,7 +1664,7 @@
    "referenced_type" : "type-276",
    "self_type" : "type-278",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1673,7 +1673,7 @@
    "referenced_type" : "type-287",
    "self_type" : "type-289",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1682,7 +1682,7 @@
    "referenced_type" : "type-295",
    "self_type" : "type-297",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1691,7 +1691,7 @@
    "referenced_type" : "type-303",
    "self_type" : "type-305",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1700,7 +1700,7 @@
    "referenced_type" : "type-313",
    "self_type" : "type-315",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1709,7 +1709,7 @@
    "referenced_type" : "type-321",
    "self_type" : "type-323",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1718,7 +1718,7 @@
    "referenced_type" : "type-332",
    "self_type" : "type-334",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1727,7 +1727,7 @@
    "referenced_type" : "type-345",
    "self_type" : "type-347",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1736,7 +1736,7 @@
    "referenced_type" : "type-355",
    "self_type" : "type-357",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1745,7 +1745,7 @@
    "referenced_type" : "type-382",
    "self_type" : "type-384",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1754,7 +1754,7 @@
    "referenced_type" : "type-409",
    "self_type" : "type-411",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1763,7 +1763,7 @@
    "referenced_type" : "type-424",
    "self_type" : "type-426",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1772,7 +1772,7 @@
    "referenced_type" : "type-435",
    "self_type" : "type-437",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1781,7 +1781,7 @@
    "referenced_type" : "type-444",
    "self_type" : "type-447",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1790,7 +1790,7 @@
    "referenced_type" : "type-456",
    "self_type" : "type-461",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1799,7 +1799,7 @@
    "referenced_type" : "type-467",
    "self_type" : "type-469",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1808,7 +1808,7 @@
    "referenced_type" : "type-475",
    "self_type" : "type-477",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1817,7 +1817,7 @@
    "referenced_type" : "type-488",
    "self_type" : "type-490",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1826,7 +1826,7 @@
    "referenced_type" : "type-56",
    "self_type" : "type-58",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1835,7 +1835,7 @@
    "referenced_type" : "type-92",
    "self_type" : "type-94",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1844,7 +1844,7 @@
    "referenced_type" : "type-102",
    "self_type" : "type-101",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1853,7 +1853,7 @@
    "referenced_type" : "type-111",
    "self_type" : "type-114",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1862,7 +1862,7 @@
    "referenced_type" : "type-123",
    "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1871,7 +1871,7 @@
    "referenced_type" : "type-138",
    "self_type" : "type-137",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1880,7 +1880,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1889,7 +1889,7 @@
    "referenced_type" : "type-141",
    "self_type" : "type-140",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1898,7 +1898,7 @@
    "referenced_type" : "type-168",
    "self_type" : "type-167",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1907,7 +1907,7 @@
    "referenced_type" : "type-178",
    "self_type" : "type-177",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1916,7 +1916,7 @@
    "referenced_type" : "type-181",
    "self_type" : "type-183",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1925,7 +1925,7 @@
    "referenced_type" : "type-190",
    "self_type" : "type-192",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1934,7 +1934,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-193",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1943,7 +1943,7 @@
    "referenced_type" : "type-197",
    "self_type" : "type-196",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1952,7 +1952,7 @@
    "referenced_type" : "type-200",
    "self_type" : "type-199",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1961,7 +1961,7 @@
    "referenced_type" : "type-209",
    "self_type" : "type-208",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1970,7 +1970,7 @@
    "referenced_type" : "type-217",
    "self_type" : "type-216",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1979,7 +1979,7 @@
    "referenced_type" : "type-221",
    "self_type" : "type-220",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1988,7 +1988,7 @@
    "referenced_type" : "type-223",
    "self_type" : "type-225",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1997,7 +1997,7 @@
    "referenced_type" : "type-232",
    "self_type" : "type-235",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2006,7 +2006,7 @@
    "referenced_type" : "type-236",
    "self_type" : "type-238",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2015,7 +2015,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-248",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2024,7 +2024,7 @@
    "referenced_type" : "type-25",
    "self_type" : "type-24",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2033,7 +2033,7 @@
    "referenced_type" : "type-264",
    "self_type" : "type-263",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2042,7 +2042,7 @@
    "referenced_type" : "type-267",
    "self_type" : "type-266",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2051,7 +2051,7 @@
    "referenced_type" : "type-271",
    "self_type" : "type-273",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2060,7 +2060,7 @@
    "referenced_type" : "type-28",
    "self_type" : "type-31",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2069,7 +2069,7 @@
    "referenced_type" : "type-283",
    "self_type" : "type-282",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2078,7 +2078,7 @@
    "referenced_type" : "type-290",
    "self_type" : "type-292",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2087,7 +2087,7 @@
    "referenced_type" : "type-299",
    "self_type" : "type-298",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2096,7 +2096,7 @@
    "referenced_type" : "type-309",
    "self_type" : "type-308",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2105,7 +2105,7 @@
    "referenced_type" : "type-317",
    "self_type" : "type-316",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2114,7 +2114,7 @@
    "referenced_type" : "type-325",
    "self_type" : "type-324",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2123,7 +2123,7 @@
    "referenced_type" : "type-328",
    "self_type" : "type-327",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2132,7 +2132,7 @@
    "referenced_type" : "type-350",
    "self_type" : "type-349",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2141,7 +2141,7 @@
    "referenced_type" : "type-360",
    "self_type" : "type-359",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2150,7 +2150,7 @@
    "referenced_type" : "type-363",
    "self_type" : "type-365",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2159,7 +2159,7 @@
    "referenced_type" : "type-372",
    "self_type" : "type-374",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2168,7 +2168,7 @@
    "referenced_type" : "type-375",
    "self_type" : "type-377",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2177,7 +2177,7 @@
    "referenced_type" : "type-386",
    "self_type" : "type-385",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2186,7 +2186,7 @@
    "referenced_type" : "type-399",
    "self_type" : "type-398",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2195,7 +2195,7 @@
    "referenced_type" : "type-403",
    "self_type" : "type-405",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2204,7 +2204,7 @@
    "referenced_type" : "type-415",
    "self_type" : "type-414",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2213,7 +2213,7 @@
    "referenced_type" : "type-419",
    "self_type" : "type-418",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2222,7 +2222,7 @@
    "referenced_type" : "type-427",
    "self_type" : "type-430",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2231,7 +2231,7 @@
    "referenced_type" : "type-43",
    "self_type" : "type-45",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2240,7 +2240,7 @@
    "referenced_type" : "type-439",
    "self_type" : "type-438",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2249,7 +2249,7 @@
    "referenced_type" : "type-451",
    "self_type" : "type-450",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2258,7 +2258,7 @@
    "referenced_type" : "type-459",
    "self_type" : "type-458",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2267,7 +2267,7 @@
    "referenced_type" : "type-46",
    "self_type" : "type-48",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2276,7 +2276,7 @@
    "referenced_type" : "type-463",
    "self_type" : "type-462",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2285,7 +2285,7 @@
    "referenced_type" : "type-471",
    "self_type" : "type-470",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2294,7 +2294,7 @@
    "referenced_type" : "type-479",
    "self_type" : "type-478",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2303,7 +2303,7 @@
    "referenced_type" : "type-60",
    "self_type" : "type-59",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2312,7 +2312,7 @@
    "referenced_type" : "type-79",
    "self_type" : "type-78",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2321,7 +2321,7 @@
    "referenced_type" : "type-87",
    "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2330,7 +2330,7 @@
    "referenced_type" : "type-98",
    "self_type" : "type-97",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   }
  ],
  "pointer_types" :
@@ -2342,7 +2342,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-69",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2351,7 +2351,7 @@
    "referenced_type" : "type-253",
    "self_type" : "type-252",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2360,7 +2360,7 @@
    "referenced_type" : "type-389",
    "self_type" : "type-388",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2369,7 +2369,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-66",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2378,7 +2378,7 @@
    "referenced_type" : "type-270",
    "self_type" : "type-269",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2387,7 +2387,7 @@
    "referenced_type" : "type-402",
    "self_type" : "type-401",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2396,7 +2396,7 @@
    "referenced_type" : "type-82",
    "self_type" : "type-81",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2405,7 +2405,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-105",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2414,7 +2414,7 @@
    "referenced_type" : "type-117",
    "self_type" : "type-116",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2423,7 +2423,7 @@
    "referenced_type" : "type-128",
    "self_type" : "type-127",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2432,7 +2432,7 @@
    "referenced_type" : "type-148",
    "self_type" : "type-147",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2441,7 +2441,7 @@
    "referenced_type" : "type-172",
    "self_type" : "type-171",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2450,7 +2450,7 @@
    "referenced_type" : "type-19",
    "self_type" : "type-18",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2459,7 +2459,7 @@
    "referenced_type" : "type-203",
    "self_type" : "type-202",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2468,7 +2468,7 @@
    "referenced_type" : "type-212",
    "self_type" : "type-211",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2477,7 +2477,7 @@
    "referenced_type" : "type-244",
    "self_type" : "type-243",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2486,7 +2486,7 @@
    "referenced_type" : "type-275",
    "self_type" : "type-274",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2495,7 +2495,7 @@
    "referenced_type" : "type-286",
    "self_type" : "type-285",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2504,7 +2504,7 @@
    "referenced_type" : "type-294",
    "self_type" : "type-293",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2513,7 +2513,7 @@
    "referenced_type" : "type-302",
    "self_type" : "type-301",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2522,7 +2522,7 @@
    "referenced_type" : "type-312",
    "self_type" : "type-311",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2531,7 +2531,7 @@
    "referenced_type" : "type-320",
    "self_type" : "type-319",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2540,7 +2540,7 @@
    "referenced_type" : "type-331",
    "self_type" : "type-330",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2549,7 +2549,7 @@
    "referenced_type" : "type-339",
    "self_type" : "type-338",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2558,7 +2558,7 @@
    "referenced_type" : "type-354",
    "self_type" : "type-353",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2567,7 +2567,7 @@
    "referenced_type" : "type-381",
    "self_type" : "type-380",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2576,7 +2576,7 @@
    "referenced_type" : "type-408",
    "self_type" : "type-407",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2585,7 +2585,7 @@
    "referenced_type" : "type-422",
    "self_type" : "type-421",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2594,7 +2594,7 @@
    "referenced_type" : "type-433",
    "self_type" : "type-432",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2603,7 +2603,7 @@
    "referenced_type" : "type-443",
    "self_type" : "type-442",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2612,7 +2612,7 @@
    "referenced_type" : "type-455",
    "self_type" : "type-454",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2621,7 +2621,7 @@
    "referenced_type" : "type-466",
    "self_type" : "type-465",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2630,7 +2630,7 @@
    "referenced_type" : "type-474",
    "self_type" : "type-473",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2639,7 +2639,7 @@
    "referenced_type" : "type-482",
    "self_type" : "type-481",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2648,7 +2648,7 @@
    "referenced_type" : "type-55",
    "self_type" : "type-54",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2657,7 +2657,7 @@
    "referenced_type" : "type-91",
    "self_type" : "type-90",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2666,7 +2666,7 @@
    "referenced_type" : "type-147",
    "self_type" : "type-149",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2675,7 +2675,7 @@
    "referenced_type" : "type-202",
    "self_type" : "type-204",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2684,7 +2684,7 @@
    "referenced_type" : "type-338",
    "self_type" : "type-340",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2693,7 +2693,7 @@
    "referenced_type" : "type-481",
    "self_type" : "type-483",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2702,7 +2702,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-151",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2711,7 +2711,7 @@
    "referenced_type" : "type-9",
    "self_type" : "type-125",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2720,7 +2720,7 @@
    "referenced_type" : "type-73",
    "self_type" : "type-74",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2729,7 +2729,7 @@
    "referenced_type" : "type-256",
    "self_type" : "type-258",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2738,7 +2738,7 @@
    "referenced_type" : "type-279",
    "self_type" : "type-281",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2747,7 +2747,7 @@
    "referenced_type" : "type-392",
    "self_type" : "type-394",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2756,7 +2756,7 @@
    "referenced_type" : "type-412",
    "self_type" : "type-417",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2765,7 +2765,7 @@
    "referenced_type" : "type-70",
    "self_type" : "type-72",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2774,7 +2774,7 @@
    "referenced_type" : "type-95",
    "self_type" : "type-100",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2783,7 +2783,7 @@
    "referenced_type" : "type-152",
    "self_type" : "type-153",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2792,7 +2792,7 @@
    "referenced_type" : "type-12",
    "self_type" : "type-11",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2801,7 +2801,7 @@
    "referenced_type" : "type-11",
    "self_type" : "type-10",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2810,7 +2810,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-113",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2819,7 +2819,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-23",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2828,7 +2828,7 @@
    "referenced_type" : "type-49",
    "self_type" : "type-51",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "alignment" : 4,
@@ -2837,7 +2837,7 @@
    "referenced_type" : "type-133",
    "self_type" : "type-135",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2846,7 +2846,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-118",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2855,7 +2855,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-136",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2864,7 +2864,7 @@
    "referenced_type" : "type-187",
    "self_type" : "type-186",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2873,7 +2873,7 @@
    "referenced_type" : "type-229",
    "self_type" : "type-228",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2882,7 +2882,7 @@
    "referenced_type" : "type-369",
    "self_type" : "type-368",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2891,7 +2891,7 @@
    "referenced_type" : "type-38",
    "self_type" : "type-37",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2900,7 +2900,7 @@
    "referenced_type" : "type-34",
    "self_type" : "type-68",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2909,7 +2909,7 @@
    "referenced_type" : "type-189",
    "self_type" : "type-188",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2918,7 +2918,7 @@
    "referenced_type" : "type-231",
    "self_type" : "type-230",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2927,7 +2927,7 @@
    "referenced_type" : "type-371",
    "self_type" : "type-370",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2936,7 +2936,7 @@
    "referenced_type" : "type-42",
    "self_type" : "type-41",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2945,7 +2945,7 @@
    "referenced_type" : "type-2",
    "self_type" : "type-75",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2954,7 +2954,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-134",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "qualified_types" :
@@ -2965,7 +2965,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-8",
    "self_type" : "type-33",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2975,7 +2975,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-73",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "is_const" : true,
@@ -2983,7 +2983,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-257",
    "self_type" : "type-256",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2993,7 +2993,7 @@
    "referenced_type" : "type-280",
    "self_type" : "type-279",
    "size" : 116,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "is_const" : true,
@@ -3001,7 +3001,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-393",
    "self_type" : "type-392",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -3011,7 +3011,7 @@
    "referenced_type" : "type-413",
    "self_type" : "type-412",
    "size" : 116,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "is_const" : true,
@@ -3019,7 +3019,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-71",
    "self_type" : "type-70",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -3029,7 +3029,7 @@
    "referenced_type" : "type-96",
    "self_type" : "type-95",
    "size" : 116,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -3039,7 +3039,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-152",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -3049,7 +3049,7 @@
    "referenced_type" : "type-9",
    "self_type" : "type-12",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3059,7 +3059,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-107",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -3069,7 +3069,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-16",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3079,7 +3079,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-108",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3089,7 +3089,7 @@
    "referenced_type" : "type-120",
    "self_type" : "type-119",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3099,7 +3099,7 @@
    "referenced_type" : "type-130",
    "self_type" : "type-129",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3109,7 +3109,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-155",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3119,7 +3119,7 @@
    "referenced_type" : "type-174",
    "self_type" : "type-173",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3129,7 +3129,7 @@
    "referenced_type" : "type-206",
    "self_type" : "type-205",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3139,7 +3139,7 @@
    "referenced_type" : "type-214",
    "self_type" : "type-213",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3149,7 +3149,7 @@
    "referenced_type" : "type-21",
    "self_type" : "type-20",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3159,7 +3159,7 @@
    "referenced_type" : "type-246",
    "self_type" : "type-245",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3169,7 +3169,7 @@
    "referenced_type" : "type-277",
    "self_type" : "type-276",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3179,7 +3179,7 @@
    "referenced_type" : "type-288",
    "self_type" : "type-287",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3189,7 +3189,7 @@
    "referenced_type" : "type-296",
    "self_type" : "type-295",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3199,7 +3199,7 @@
    "referenced_type" : "type-304",
    "self_type" : "type-303",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3209,7 +3209,7 @@
    "referenced_type" : "type-314",
    "self_type" : "type-313",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3219,7 +3219,7 @@
    "referenced_type" : "type-322",
    "self_type" : "type-321",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3229,7 +3229,7 @@
    "referenced_type" : "type-333",
    "self_type" : "type-332",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3239,7 +3239,7 @@
    "referenced_type" : "type-346",
    "self_type" : "type-345",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3249,7 +3249,7 @@
    "referenced_type" : "type-356",
    "self_type" : "type-355",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3259,7 +3259,7 @@
    "referenced_type" : "type-383",
    "self_type" : "type-382",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3269,7 +3269,7 @@
    "referenced_type" : "type-410",
    "self_type" : "type-409",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3279,7 +3279,7 @@
    "referenced_type" : "type-425",
    "self_type" : "type-424",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3289,7 +3289,7 @@
    "referenced_type" : "type-436",
    "self_type" : "type-435",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3299,7 +3299,7 @@
    "referenced_type" : "type-445",
    "self_type" : "type-444",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3309,7 +3309,7 @@
    "referenced_type" : "type-457",
    "self_type" : "type-456",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3319,7 +3319,7 @@
    "referenced_type" : "type-468",
    "self_type" : "type-467",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3329,7 +3329,7 @@
    "referenced_type" : "type-476",
    "self_type" : "type-475",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3339,7 +3339,7 @@
    "referenced_type" : "type-489",
    "self_type" : "type-488",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3349,7 +3349,7 @@
    "referenced_type" : "type-57",
    "self_type" : "type-56",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3359,7 +3359,7 @@
    "referenced_type" : "type-93",
    "self_type" : "type-92",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3369,7 +3369,7 @@
    "referenced_type" : "type-103",
    "self_type" : "type-102",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3379,7 +3379,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-111",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3389,7 +3389,7 @@
    "referenced_type" : "type-124",
    "self_type" : "type-123",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3399,7 +3399,7 @@
    "referenced_type" : "type-139",
    "self_type" : "type-138",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3409,7 +3409,7 @@
    "referenced_type" : "type-142",
    "self_type" : "type-141",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3419,7 +3419,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-14",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3429,7 +3429,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-168",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3439,7 +3439,7 @@
    "referenced_type" : "type-179",
    "self_type" : "type-178",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3449,7 +3449,7 @@
    "referenced_type" : "type-182",
    "self_type" : "type-181",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3459,7 +3459,7 @@
    "referenced_type" : "type-191",
    "self_type" : "type-190",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3469,7 +3469,7 @@
    "referenced_type" : "type-195",
    "self_type" : "type-194",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3479,7 +3479,7 @@
    "referenced_type" : "type-198",
    "self_type" : "type-197",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3489,7 +3489,7 @@
    "referenced_type" : "type-201",
    "self_type" : "type-200",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3499,7 +3499,7 @@
    "referenced_type" : "type-210",
    "self_type" : "type-209",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3509,7 +3509,7 @@
    "referenced_type" : "type-218",
    "self_type" : "type-217",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3519,7 +3519,7 @@
    "referenced_type" : "type-222",
    "self_type" : "type-221",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3529,7 +3529,7 @@
    "referenced_type" : "type-224",
    "self_type" : "type-223",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3539,7 +3539,7 @@
    "referenced_type" : "type-233",
    "self_type" : "type-232",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3549,7 +3549,7 @@
    "referenced_type" : "type-237",
    "self_type" : "type-236",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3559,7 +3559,7 @@
    "referenced_type" : "type-250",
    "self_type" : "type-249",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3569,7 +3569,7 @@
    "referenced_type" : "type-265",
    "self_type" : "type-264",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3579,7 +3579,7 @@
    "referenced_type" : "type-268",
    "self_type" : "type-267",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3589,7 +3589,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3599,7 +3599,7 @@
    "referenced_type" : "type-272",
    "self_type" : "type-271",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3609,7 +3609,7 @@
    "referenced_type" : "type-284",
    "self_type" : "type-283",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3619,7 +3619,7 @@
    "referenced_type" : "type-291",
    "self_type" : "type-290",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3629,7 +3629,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-28",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3639,7 +3639,7 @@
    "referenced_type" : "type-300",
    "self_type" : "type-299",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3649,7 +3649,7 @@
    "referenced_type" : "type-310",
    "self_type" : "type-309",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3659,7 +3659,7 @@
    "referenced_type" : "type-318",
    "self_type" : "type-317",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3669,7 +3669,7 @@
    "referenced_type" : "type-326",
    "self_type" : "type-325",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3679,7 +3679,7 @@
    "referenced_type" : "type-329",
    "self_type" : "type-328",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3689,7 +3689,7 @@
    "referenced_type" : "type-351",
    "self_type" : "type-350",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3699,7 +3699,7 @@
    "referenced_type" : "type-361",
    "self_type" : "type-360",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3709,7 +3709,7 @@
    "referenced_type" : "type-364",
    "self_type" : "type-363",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3719,7 +3719,7 @@
    "referenced_type" : "type-373",
    "self_type" : "type-372",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3729,7 +3729,7 @@
    "referenced_type" : "type-376",
    "self_type" : "type-375",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3739,7 +3739,7 @@
    "referenced_type" : "type-387",
    "self_type" : "type-386",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3749,7 +3749,7 @@
    "referenced_type" : "type-400",
    "self_type" : "type-399",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3759,7 +3759,7 @@
    "referenced_type" : "type-404",
    "self_type" : "type-403",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3769,7 +3769,7 @@
    "referenced_type" : "type-416",
    "self_type" : "type-415",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3779,7 +3779,7 @@
    "referenced_type" : "type-420",
    "self_type" : "type-419",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3789,7 +3789,7 @@
    "referenced_type" : "type-428",
    "self_type" : "type-427",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3799,7 +3799,7 @@
    "referenced_type" : "type-440",
    "self_type" : "type-439",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3809,7 +3809,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-43",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3819,7 +3819,7 @@
    "referenced_type" : "type-452",
    "self_type" : "type-451",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3829,7 +3829,7 @@
    "referenced_type" : "type-460",
    "self_type" : "type-459",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3839,7 +3839,7 @@
    "referenced_type" : "type-464",
    "self_type" : "type-463",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3849,7 +3849,7 @@
    "referenced_type" : "type-472",
    "self_type" : "type-471",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3859,7 +3859,7 @@
    "referenced_type" : "type-47",
    "self_type" : "type-46",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3869,7 +3869,7 @@
    "referenced_type" : "type-480",
    "self_type" : "type-479",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3879,7 +3879,7 @@
    "referenced_type" : "type-61",
    "self_type" : "type-60",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3889,7 +3889,7 @@
    "referenced_type" : "type-80",
    "self_type" : "type-79",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3899,7 +3899,7 @@
    "referenced_type" : "type-88",
    "self_type" : "type-87",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3909,7 +3909,7 @@
    "referenced_type" : "type-99",
    "self_type" : "type-98",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3919,7 +3919,7 @@
    "referenced_type" : "type-2",
    "self_type" : "type-131",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "is_const" : true,
@@ -3927,7 +3927,7 @@
    "name" : "const void",
    "referenced_type" : "type-50",
    "self_type" : "type-49",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   }
  ],
  "record_types" :
@@ -3991,7 +3991,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-65",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "unique_id" : "AndroidLogEntry_t"
   },
   {
@@ -4008,7 +4008,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-5",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_header_t"
   },
   {
@@ -4030,7 +4030,7 @@
    "referenced_type" : "type-160",
    "self_type" : "type-160",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_int_t"
   },
   {
@@ -4052,7 +4052,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-162",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_long_t"
   },
   {
@@ -4079,7 +4079,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-164",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_string_t"
   },
   {
@@ -4101,7 +4101,7 @@
    "referenced_type" : "type-161",
    "self_type" : "type-161",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_int_t"
   },
   {
@@ -4126,7 +4126,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-150",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
    "unique_id" : "_ZTS22android_log_event_list"
   },
   {
@@ -4148,7 +4148,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-163",
    "size" : 13,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_long_t"
   },
   {
@@ -4180,7 +4180,7 @@
    "referenced_type" : "type-4",
    "self_type" : "type-4",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_string_t"
   },
   {
@@ -4207,7 +4207,7 @@
    "referenced_type" : "type-159",
    "self_type" : "type-159",
    "size" : 11,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_header_t"
   },
   {
@@ -4239,7 +4239,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-143",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
    "unique_id" : "android_log_list_element"
   },
   {
@@ -4264,14 +4264,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3) at system/logging/liblog/include/log/log_event_list.h:53:3",
-   "name" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3) at system/logging/liblog/include/log/log_event_list.h:53:3",
+   "linker_set_key" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3) at system/core/liblog/include/log/log_event_list.h:53:3",
+   "name" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3) at system/core/liblog/include/log/log_event_list.h:53:3",
    "record_kind" : "union",
    "referenced_type" : "type-144",
    "self_type" : "type-144",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
-   "unique_id" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3)"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
+   "unique_id" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3)"
   },
   {
    "alignment" : 1,
@@ -4302,7 +4302,7 @@
    "referenced_type" : "type-158",
    "self_type" : "type-158",
    "size" : 7,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_pmsg_log_header_t"
   },
   {
@@ -4318,7 +4318,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-83",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -4351,14 +4351,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-84",
    "self_type" : "type-84",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -4379,7 +4379,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-17",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -4426,7 +4426,7 @@
    "referenced_type" : "type-34",
    "self_type" : "type-34",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -4478,7 +4478,7 @@
    "referenced_type" : "type-52",
    "self_type" : "type-52",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -4530,7 +4530,7 @@
    "referenced_type" : "type-62",
    "self_type" : "type-62",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -4587,7 +4587,7 @@
    "referenced_type" : "type-76",
    "self_type" : "type-76",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   }
  ],
diff --git a/29/32/arm_armv7-a-neon/source-based/libmediandk.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
index d69d0e0..138814b 100644
--- a/29/32/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
+++ b/29/32/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
@@ -203,7 +203,7 @@
    "name" : "char []",
    "referenced_type" : "type-42",
    "self_type" : "type-2245",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -308,7 +308,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-2316",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -2045,7 +2045,7 @@
    "referenced_type" : "type-2377",
    "self_type" : "type-2377",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "AndroidEventLogType"
   },
@@ -4756,7 +4756,7 @@
    "referenced_type" : "type-2131",
    "self_type" : "type-2131",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "android_LogPriority"
   },
@@ -7238,7 +7238,7 @@
    "referenced_type" : "type-2143",
    "self_type" : "type-2143",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "log_id"
   },
@@ -13607,7 +13607,7 @@
    "referenced_type" : "type-2333",
    "self_type" : "type-2357",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -13616,7 +13616,7 @@
    "referenced_type" : "type-2215",
    "self_type" : "type-2234",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13769,7 +13769,7 @@
    "referenced_type" : "type-1065",
    "self_type" : "type-1067",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13778,7 +13778,7 @@
    "referenced_type" : "type-1211",
    "self_type" : "type-1210",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13787,7 +13787,7 @@
    "referenced_type" : "type-1628",
    "self_type" : "type-1627",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13796,7 +13796,7 @@
    "referenced_type" : "type-2181",
    "self_type" : "type-2206",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13805,7 +13805,7 @@
    "referenced_type" : "type-2752",
    "self_type" : "type-2754",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13814,7 +13814,7 @@
    "referenced_type" : "type-2779",
    "self_type" : "type-2781",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13823,7 +13823,7 @@
    "referenced_type" : "type-2971",
    "self_type" : "type-2977",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13832,7 +13832,7 @@
    "referenced_type" : "type-3029",
    "self_type" : "type-3033",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13841,7 +13841,7 @@
    "referenced_type" : "type-3076",
    "self_type" : "type-3078",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13850,7 +13850,7 @@
    "referenced_type" : "type-3146",
    "self_type" : "type-3148",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13859,7 +13859,7 @@
    "referenced_type" : "type-3374",
    "self_type" : "type-3376",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13868,7 +13868,7 @@
    "referenced_type" : "type-3475",
    "self_type" : "type-3477",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13877,7 +13877,7 @@
    "referenced_type" : "type-3494",
    "self_type" : "type-3496",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13886,7 +13886,7 @@
    "referenced_type" : "type-3630",
    "self_type" : "type-3636",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13895,7 +13895,7 @@
    "referenced_type" : "type-3665",
    "self_type" : "type-3669",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13904,7 +13904,7 @@
    "referenced_type" : "type-3712",
    "self_type" : "type-3714",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13913,7 +13913,7 @@
    "referenced_type" : "type-3760",
    "self_type" : "type-3764",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13922,7 +13922,7 @@
    "referenced_type" : "type-3852",
    "self_type" : "type-3851",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13931,7 +13931,7 @@
    "referenced_type" : "type-387",
    "self_type" : "type-389",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13940,7 +13940,7 @@
    "referenced_type" : "type-4127",
    "self_type" : "type-4126",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13949,7 +13949,7 @@
    "referenced_type" : "type-4412",
    "self_type" : "type-4420",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13958,7 +13958,7 @@
    "referenced_type" : "type-455",
    "self_type" : "type-457",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13967,7 +13967,7 @@
    "referenced_type" : "type-793",
    "self_type" : "type-799",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13976,7 +13976,7 @@
    "referenced_type" : "type-886",
    "self_type" : "type-890",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13985,7 +13985,7 @@
    "referenced_type" : "type-949",
    "self_type" : "type-951",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -22115,7 +22115,7 @@
    "referenced_type" : "type-2333",
    "self_type" : "type-2356",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -22124,7 +22124,7 @@
    "referenced_type" : "type-2215",
    "self_type" : "type-2224",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -22628,7 +22628,7 @@
    "referenced_type" : "type-2314",
    "self_type" : "type-2367",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -22637,7 +22637,7 @@
    "referenced_type" : "type-2156",
    "self_type" : "type-2195",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -23372,7 +23372,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-2245",
    "self_type" : "type-2261",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -26312,7 +26312,7 @@
    "referenced_type" : "type-2314",
    "self_type" : "type-2333",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -26322,7 +26322,7 @@
    "referenced_type" : "type-2156",
    "self_type" : "type-2215",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28902,7 +28902,7 @@
    "referenced_type" : "type-1066",
    "self_type" : "type-1065",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28912,7 +28912,7 @@
    "referenced_type" : "type-1212",
    "self_type" : "type-1211",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28922,7 +28922,7 @@
    "referenced_type" : "type-1629",
    "self_type" : "type-1628",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28932,7 +28932,7 @@
    "referenced_type" : "type-2182",
    "self_type" : "type-2181",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28942,7 +28942,7 @@
    "referenced_type" : "type-2753",
    "self_type" : "type-2752",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28952,7 +28952,7 @@
    "referenced_type" : "type-2780",
    "self_type" : "type-2779",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28962,7 +28962,7 @@
    "referenced_type" : "type-2972",
    "self_type" : "type-2971",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28972,7 +28972,7 @@
    "referenced_type" : "type-3030",
    "self_type" : "type-3029",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28982,7 +28982,7 @@
    "referenced_type" : "type-3077",
    "self_type" : "type-3076",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28992,7 +28992,7 @@
    "referenced_type" : "type-3147",
    "self_type" : "type-3146",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29002,7 +29002,7 @@
    "referenced_type" : "type-3375",
    "self_type" : "type-3374",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29012,7 +29012,7 @@
    "referenced_type" : "type-3476",
    "self_type" : "type-3475",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29022,7 +29022,7 @@
    "referenced_type" : "type-3495",
    "self_type" : "type-3494",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29032,7 +29032,7 @@
    "referenced_type" : "type-3631",
    "self_type" : "type-3630",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29042,7 +29042,7 @@
    "referenced_type" : "type-3666",
    "self_type" : "type-3665",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29052,7 +29052,7 @@
    "referenced_type" : "type-3713",
    "self_type" : "type-3712",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29062,7 +29062,7 @@
    "referenced_type" : "type-3761",
    "self_type" : "type-3760",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29072,7 +29072,7 @@
    "referenced_type" : "type-3853",
    "self_type" : "type-3852",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29082,7 +29082,7 @@
    "referenced_type" : "type-388",
    "self_type" : "type-387",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29092,7 +29092,7 @@
    "referenced_type" : "type-4128",
    "self_type" : "type-4127",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29102,7 +29102,7 @@
    "referenced_type" : "type-4413",
    "self_type" : "type-4412",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29112,7 +29112,7 @@
    "referenced_type" : "type-456",
    "self_type" : "type-455",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29122,7 +29122,7 @@
    "referenced_type" : "type-794",
    "self_type" : "type-793",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29132,7 +29132,7 @@
    "referenced_type" : "type-887",
    "self_type" : "type-886",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29142,7 +29142,7 @@
    "referenced_type" : "type-950",
    "self_type" : "type-949",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -29162,7 +29162,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-195",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -52778,7 +52778,7 @@
    "referenced_type" : "type-2314",
    "self_type" : "type-2314",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -52811,14 +52811,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2315",
    "self_type" : "type-2315",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -52839,7 +52839,7 @@
    "referenced_type" : "type-2156",
    "self_type" : "type-2156",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -52886,7 +52886,7 @@
    "referenced_type" : "type-2268",
    "self_type" : "type-2268",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -52938,7 +52938,7 @@
    "referenced_type" : "type-2289",
    "self_type" : "type-2289",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -52990,7 +52990,7 @@
    "referenced_type" : "type-2301",
    "self_type" : "type-2301",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -53047,7 +53047,7 @@
    "referenced_type" : "type-2304",
    "self_type" : "type-2304",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/32/arm_armv7-a-neon/source-based/libstdc++.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libstdc++.so.lsdump
index d0a9087..33440ac 100644
--- a/29/32/arm_armv7-a-neon/source-based/libstdc++.so.lsdump
+++ b/29/32/arm_armv7-a-neon/source-based/libstdc++.so.lsdump
@@ -360,7 +360,7 @@
    "referenced_type" : "type-60",
    "self_type" : "type-60",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-21",
    "unique_id" : "android_LogPriority"
   },
@@ -414,7 +414,7 @@
    "referenced_type" : "type-61",
    "self_type" : "type-61",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-21",
    "unique_id" : "log_id"
   },
diff --git a/29/32/x86/source-based/libOpenMAXAL.so.lsdump b/29/32/x86/source-based/libOpenMAXAL.so.lsdump
index 6abefaf..0dd04e4 100644
--- a/29/32/x86/source-based/libOpenMAXAL.so.lsdump
+++ b/29/32/x86/source-based/libOpenMAXAL.so.lsdump
@@ -105,7 +105,7 @@
    "name" : "char []",
    "referenced_type" : "type-143",
    "self_type" : "type-814",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -218,7 +218,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-2594",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1017,7 +1017,7 @@
    "referenced_type" : "type-2612",
    "self_type" : "type-2612",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -2554,7 +2554,7 @@
    "referenced_type" : "type-2573",
    "self_type" : "type-2573",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -5028,7 +5028,7 @@
    "referenced_type" : "type-2574",
    "self_type" : "type-2574",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -15893,7 +15893,7 @@
    "referenced_type" : "type-2608",
    "self_type" : "type-2610",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -15902,7 +15902,7 @@
    "referenced_type" : "type-2580",
    "self_type" : "type-2582",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16010,7 +16010,7 @@
    "referenced_type" : "type-2164",
    "self_type" : "type-2176",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16019,7 +16019,7 @@
    "referenced_type" : "type-2359",
    "self_type" : "type-2358",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16028,7 +16028,7 @@
    "referenced_type" : "type-2576",
    "self_type" : "type-2579",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -18056,7 +18056,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-362",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20531,7 +20531,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-162",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20576,7 +20576,7 @@
    "referenced_type" : "type-2608",
    "self_type" : "type-2609",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20585,7 +20585,7 @@
    "referenced_type" : "type-2580",
    "self_type" : "type-2581",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20837,7 +20837,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2611",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20846,7 +20846,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2578",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25099,7 +25099,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-814",
    "self_type" : "type-2583",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -27985,7 +27985,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-163",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28055,7 +28055,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2608",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28065,7 +28065,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2580",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28195,7 +28195,7 @@
    "referenced_type" : "type-2165",
    "self_type" : "type-2164",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28205,7 +28205,7 @@
    "referenced_type" : "type-2360",
    "self_type" : "type-2359",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28215,7 +28215,7 @@
    "referenced_type" : "type-2577",
    "self_type" : "type-2576",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -60152,7 +60152,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2592",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -60185,14 +60185,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2593",
    "self_type" : "type-2593",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -60213,7 +60213,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2575",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -60260,7 +60260,7 @@
    "referenced_type" : "type-2584",
    "self_type" : "type-2584",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -60312,7 +60312,7 @@
    "referenced_type" : "type-2586",
    "self_type" : "type-2586",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -60364,7 +60364,7 @@
    "referenced_type" : "type-2588",
    "self_type" : "type-2588",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -60421,7 +60421,7 @@
    "referenced_type" : "type-2590",
    "self_type" : "type-2590",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/32/x86/source-based/libOpenSLES.so.lsdump b/29/32/x86/source-based/libOpenSLES.so.lsdump
index be5f24b..b755e17 100644
--- a/29/32/x86/source-based/libOpenSLES.so.lsdump
+++ b/29/32/x86/source-based/libOpenSLES.so.lsdump
@@ -105,7 +105,7 @@
    "name" : "char []",
    "referenced_type" : "type-143",
    "self_type" : "type-814",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -218,7 +218,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-2594",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1053,7 +1053,7 @@
    "referenced_type" : "type-2612",
    "self_type" : "type-2612",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -2590,7 +2590,7 @@
    "referenced_type" : "type-2573",
    "self_type" : "type-2573",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -5064,7 +5064,7 @@
    "referenced_type" : "type-2574",
    "self_type" : "type-2574",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -16001,7 +16001,7 @@
    "referenced_type" : "type-2608",
    "self_type" : "type-2610",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -16010,7 +16010,7 @@
    "referenced_type" : "type-2580",
    "self_type" : "type-2582",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16118,7 +16118,7 @@
    "referenced_type" : "type-2164",
    "self_type" : "type-2176",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16127,7 +16127,7 @@
    "referenced_type" : "type-2359",
    "self_type" : "type-2358",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16136,7 +16136,7 @@
    "referenced_type" : "type-2576",
    "self_type" : "type-2579",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -18164,7 +18164,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-362",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20639,7 +20639,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-162",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20684,7 +20684,7 @@
    "referenced_type" : "type-2608",
    "self_type" : "type-2609",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20693,7 +20693,7 @@
    "referenced_type" : "type-2580",
    "self_type" : "type-2581",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20945,7 +20945,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2611",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20954,7 +20954,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2578",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25207,7 +25207,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-814",
    "self_type" : "type-2583",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28093,7 +28093,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-163",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28163,7 +28163,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2608",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28173,7 +28173,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2580",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28303,7 +28303,7 @@
    "referenced_type" : "type-2165",
    "self_type" : "type-2164",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28313,7 +28313,7 @@
    "referenced_type" : "type-2360",
    "self_type" : "type-2359",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28323,7 +28323,7 @@
    "referenced_type" : "type-2577",
    "self_type" : "type-2576",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -60260,7 +60260,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2592",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -60293,14 +60293,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2593",
    "self_type" : "type-2593",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -60321,7 +60321,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2575",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -60368,7 +60368,7 @@
    "referenced_type" : "type-2584",
    "self_type" : "type-2584",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -60420,7 +60420,7 @@
    "referenced_type" : "type-2586",
    "self_type" : "type-2586",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -60472,7 +60472,7 @@
    "referenced_type" : "type-2588",
    "self_type" : "type-2588",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -60529,7 +60529,7 @@
    "referenced_type" : "type-2590",
    "self_type" : "type-2590",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/32/x86/source-based/libRS.so.lsdump b/29/32/x86/source-based/libRS.so.lsdump
index 0b3e021..5dd9979 100644
--- a/29/32/x86/source-based/libRS.so.lsdump
+++ b/29/32/x86/source-based/libRS.so.lsdump
@@ -400,7 +400,7 @@
    "name" : "char []",
    "referenced_type" : "type-18",
    "self_type" : "type-4016",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 2,
@@ -642,7 +642,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-4029",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1394,7 +1394,7 @@
    "referenced_type" : "type-4036",
    "self_type" : "type-4036",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "AndroidEventLogType"
   },
@@ -4284,7 +4284,7 @@
    "referenced_type" : "type-3996",
    "self_type" : "type-3996",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "android_LogPriority"
   },
@@ -4418,7 +4418,7 @@
    "referenced_type" : "type-3997",
    "self_type" : "type-3997",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "log_id"
   },
@@ -16315,7 +16315,7 @@
    "referenced_type" : "type-4032",
    "self_type" : "type-4034",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -16324,7 +16324,7 @@
    "referenced_type" : "type-4012",
    "self_type" : "type-4014",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -17278,7 +17278,7 @@
    "referenced_type" : "type-4009",
    "self_type" : "type-4011",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -17287,7 +17287,7 @@
    "referenced_type" : "type-6899",
    "self_type" : "type-6900",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "linker_set_key" : "const uniform_int_distribution<_IntType> &",
@@ -19887,7 +19887,7 @@
    "referenced_type" : "type-4032",
    "self_type" : "type-4033",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -19896,7 +19896,7 @@
    "referenced_type" : "type-4012",
    "self_type" : "type-4013",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21867,7 +21867,7 @@
    "referenced_type" : "type-4027",
    "self_type" : "type-4035",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21876,7 +21876,7 @@
    "referenced_type" : "type-4007",
    "self_type" : "type-4010",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -26379,7 +26379,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-4016",
    "self_type" : "type-4017",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -27131,7 +27131,7 @@
    "referenced_type" : "type-4027",
    "self_type" : "type-4032",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -27141,7 +27141,7 @@
    "referenced_type" : "type-4007",
    "self_type" : "type-4012",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29327,7 +29327,7 @@
    "referenced_type" : "type-2415",
    "self_type" : "type-4009",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29337,7 +29337,7 @@
    "referenced_type" : "type-6891",
    "self_type" : "type-6899",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -36872,7 +36872,7 @@
    "referenced_type" : "type-4027",
    "self_type" : "type-4027",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -36905,14 +36905,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-4028",
    "self_type" : "type-4028",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -36933,7 +36933,7 @@
    "referenced_type" : "type-4007",
    "self_type" : "type-4007",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -36980,7 +36980,7 @@
    "referenced_type" : "type-4018",
    "self_type" : "type-4018",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -37032,7 +37032,7 @@
    "referenced_type" : "type-4021",
    "self_type" : "type-4021",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -37084,7 +37084,7 @@
    "referenced_type" : "type-4023",
    "self_type" : "type-4023",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -37141,7 +37141,7 @@
    "referenced_type" : "type-4025",
    "self_type" : "type-4025",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/32/x86/source-based/liblog.so.lsdump b/29/32/x86/source-based/liblog.so.lsdump
index 83bd212..5699e3a 100644
--- a/29/32/x86/source-based/liblog.so.lsdump
+++ b/29/32/x86/source-based/liblog.so.lsdump
@@ -6,7 +6,7 @@
    "name" : "char []",
    "referenced_type" : "type-9",
    "self_type" : "type-8",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -15,7 +15,7 @@
    "referenced_type" : "type-86",
    "self_type" : "type-85",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   }
  ],
  "builtin_types" :
@@ -352,7 +352,7 @@
    "referenced_type" : "type-126",
    "self_type" : "type-126",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -442,7 +442,7 @@
    "referenced_type" : "type-64",
    "self_type" : "type-64",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidLogPrintFormat"
   },
@@ -492,7 +492,7 @@
    "referenced_type" : "type-1",
    "self_type" : "type-1",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -546,7 +546,7 @@
    "referenced_type" : "type-104",
    "self_type" : "type-104",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -600,7 +600,7 @@
    "referenced_type" : "type-32",
    "self_type" : "type-32",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_id.h",
+   "source_file" : "/system/core/liblog/include/log/log_id.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   }
@@ -635,7 +635,7 @@
    "referenced_type" : "type-133",
    "return_type" : "type-6",
    "self_type" : "type-133",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "functions" :
@@ -656,7 +656,7 @@
     }
    ],
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bswrite",
@@ -671,7 +671,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_btwrite",
@@ -692,7 +692,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_buf_print",
@@ -713,7 +713,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_buf_write",
@@ -734,7 +734,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bwrite",
@@ -752,13 +752,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_close",
    "linker_set_key" : "__android_log_close",
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_error_write",
@@ -782,13 +782,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_safetynet.h"
+   "source_file" : "/system/core/liblog/include/log/log_safetynet.h"
   },
   {
    "function_name" : "__android_log_is_debuggable",
    "linker_set_key" : "__android_log_is_debuggable",
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_properties.h"
+   "source_file" : "/system/core/liblog/include/log/log_properties.h"
   },
   {
    "function_name" : "__android_log_is_loggable",
@@ -806,7 +806,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_main.h"
+   "source_file" : "/system/core/liblog/include/log/log_main.h"
   },
   {
    "function_name" : "__android_log_is_loggable_len",
@@ -827,7 +827,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_main.h"
+   "source_file" : "/system/core/liblog/include/log/log_main.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_read",
@@ -851,7 +851,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_write",
@@ -875,7 +875,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_print",
@@ -893,13 +893,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_security",
    "linker_set_key" : "__android_log_security",
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_security_bswrite",
@@ -914,7 +914,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_vprint",
@@ -935,7 +935,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write",
@@ -953,7 +953,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_logger_get_buffer_size",
@@ -965,7 +965,7 @@
     }
    ],
    "return_type" : "type-40",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_logger_property_get_bool",
@@ -980,7 +980,7 @@
     }
    ],
    "return_type" : "type-3",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_destroy",
@@ -992,7 +992,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_id_to_name",
@@ -1004,7 +1004,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_log_parser_reset",
@@ -1022,7 +1022,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_processBinaryLogBuffer",
@@ -1046,7 +1046,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_processLogBuffer",
@@ -1061,7 +1061,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_read_next",
@@ -1073,7 +1073,7 @@
     }
    ],
    "return_type" : "type-143",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_reset",
@@ -1085,7 +1085,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_float32",
@@ -1100,7 +1100,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int32",
@@ -1115,7 +1115,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int64",
@@ -1130,7 +1130,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list",
@@ -1145,7 +1145,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_begin",
@@ -1157,7 +1157,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_buffer",
@@ -1172,7 +1172,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_write_list_end",
@@ -1184,7 +1184,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8",
@@ -1199,7 +1199,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8_len",
@@ -1217,7 +1217,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_logger_clear",
@@ -1229,7 +1229,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_id",
@@ -1241,7 +1241,7 @@
     }
    ],
    "return_type" : "type-32",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_readable_size",
@@ -1253,7 +1253,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_size",
@@ -1265,7 +1265,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_version",
@@ -1277,7 +1277,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_prune_list",
@@ -1295,7 +1295,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_statistics",
@@ -1313,7 +1313,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc",
@@ -1331,7 +1331,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc_time",
@@ -1349,7 +1349,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_free",
@@ -1361,7 +1361,7 @@
     }
    ],
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_open",
@@ -1382,7 +1382,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_read",
@@ -1397,7 +1397,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_open",
@@ -1412,7 +1412,7 @@
     }
    ],
    "return_type" : "type-37",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_log_size",
@@ -1427,7 +1427,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_prune_list",
@@ -1445,7 +1445,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_lookupEventTagNum",
@@ -1466,7 +1466,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "android_name_to_log_id",
@@ -1478,7 +1478,7 @@
     }
    ],
    "return_type" : "type-104",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_openEventTagMap",
@@ -1490,7 +1490,7 @@
     }
    ],
    "return_type" : "type-81",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "create_android_log_parser",
@@ -1505,7 +1505,7 @@
     }
    ],
    "return_type" : "type-147",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "create_android_logger",
@@ -1517,7 +1517,7 @@
     }
    ],
    "return_type" : "type-147",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "global_vars" : [],
@@ -1530,7 +1530,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-154",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1539,7 +1539,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-115",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1548,7 +1548,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-27",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1557,7 +1557,7 @@
    "referenced_type" : "type-108",
    "self_type" : "type-110",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1566,7 +1566,7 @@
    "referenced_type" : "type-118",
    "self_type" : "type-121",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1575,7 +1575,7 @@
    "referenced_type" : "type-129",
    "self_type" : "type-132",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1584,7 +1584,7 @@
    "referenced_type" : "type-155",
    "self_type" : "type-157",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1593,7 +1593,7 @@
    "referenced_type" : "type-172",
    "self_type" : "type-174",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1602,7 +1602,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-22",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1611,7 +1611,7 @@
    "referenced_type" : "type-204",
    "self_type" : "type-206",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1620,7 +1620,7 @@
    "referenced_type" : "type-212",
    "self_type" : "type-214",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1629,7 +1629,7 @@
    "referenced_type" : "type-244",
    "self_type" : "type-246",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1638,7 +1638,7 @@
    "referenced_type" : "type-275",
    "self_type" : "type-277",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1647,7 +1647,7 @@
    "referenced_type" : "type-286",
    "self_type" : "type-288",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1656,7 +1656,7 @@
    "referenced_type" : "type-294",
    "self_type" : "type-296",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1665,7 +1665,7 @@
    "referenced_type" : "type-302",
    "self_type" : "type-304",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1674,7 +1674,7 @@
    "referenced_type" : "type-312",
    "self_type" : "type-314",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1683,7 +1683,7 @@
    "referenced_type" : "type-320",
    "self_type" : "type-322",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1692,7 +1692,7 @@
    "referenced_type" : "type-331",
    "self_type" : "type-333",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1701,7 +1701,7 @@
    "referenced_type" : "type-341",
    "self_type" : "type-343",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1710,7 +1710,7 @@
    "referenced_type" : "type-56",
    "self_type" : "type-58",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1719,7 +1719,7 @@
    "referenced_type" : "type-92",
    "self_type" : "type-94",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1728,7 +1728,7 @@
    "referenced_type" : "type-102",
    "self_type" : "type-101",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1737,7 +1737,7 @@
    "referenced_type" : "type-111",
    "self_type" : "type-114",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1746,7 +1746,7 @@
    "referenced_type" : "type-123",
    "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1755,7 +1755,7 @@
    "referenced_type" : "type-138",
    "self_type" : "type-137",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1764,7 +1764,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1773,7 +1773,7 @@
    "referenced_type" : "type-141",
    "self_type" : "type-140",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1782,7 +1782,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-166",
    "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" : "type-177",
    "self_type" : "type-176",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1800,7 +1800,7 @@
    "referenced_type" : "type-180",
    "self_type" : "type-182",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1809,7 +1809,7 @@
    "referenced_type" : "type-189",
    "self_type" : "type-191",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1818,7 +1818,7 @@
    "referenced_type" : "type-193",
    "self_type" : "type-192",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1827,7 +1827,7 @@
    "referenced_type" : "type-196",
    "self_type" : "type-195",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1836,7 +1836,7 @@
    "referenced_type" : "type-199",
    "self_type" : "type-198",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1845,7 +1845,7 @@
    "referenced_type" : "type-208",
    "self_type" : "type-207",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1854,7 +1854,7 @@
    "referenced_type" : "type-216",
    "self_type" : "type-215",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1863,7 +1863,7 @@
    "referenced_type" : "type-220",
    "self_type" : "type-219",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1872,7 +1872,7 @@
    "referenced_type" : "type-222",
    "self_type" : "type-224",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1881,7 +1881,7 @@
    "referenced_type" : "type-231",
    "self_type" : "type-234",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1890,7 +1890,7 @@
    "referenced_type" : "type-235",
    "self_type" : "type-237",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1899,7 +1899,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-247",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1908,7 +1908,7 @@
    "referenced_type" : "type-25",
    "self_type" : "type-24",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1917,7 +1917,7 @@
    "referenced_type" : "type-263",
    "self_type" : "type-262",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1926,7 +1926,7 @@
    "referenced_type" : "type-266",
    "self_type" : "type-265",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1935,7 +1935,7 @@
    "referenced_type" : "type-270",
    "self_type" : "type-272",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1944,7 +1944,7 @@
    "referenced_type" : "type-28",
    "self_type" : "type-31",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1953,7 +1953,7 @@
    "referenced_type" : "type-282",
    "self_type" : "type-281",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1962,7 +1962,7 @@
    "referenced_type" : "type-289",
    "self_type" : "type-291",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1971,7 +1971,7 @@
    "referenced_type" : "type-298",
    "self_type" : "type-297",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1980,7 +1980,7 @@
    "referenced_type" : "type-308",
    "self_type" : "type-307",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1989,7 +1989,7 @@
    "referenced_type" : "type-316",
    "self_type" : "type-315",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1998,7 +1998,7 @@
    "referenced_type" : "type-324",
    "self_type" : "type-323",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2007,7 +2007,7 @@
    "referenced_type" : "type-327",
    "self_type" : "type-326",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2016,7 +2016,7 @@
    "referenced_type" : "type-43",
    "self_type" : "type-45",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2025,7 +2025,7 @@
    "referenced_type" : "type-46",
    "self_type" : "type-48",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2034,7 +2034,7 @@
    "referenced_type" : "type-60",
    "self_type" : "type-59",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2043,7 +2043,7 @@
    "referenced_type" : "type-79",
    "self_type" : "type-78",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2052,7 +2052,7 @@
    "referenced_type" : "type-87",
    "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2061,7 +2061,7 @@
    "referenced_type" : "type-98",
    "self_type" : "type-97",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   }
  ],
  "pointer_types" :
@@ -2073,7 +2073,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-69",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2082,7 +2082,7 @@
    "referenced_type" : "type-252",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2091,7 +2091,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-66",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2100,7 +2100,7 @@
    "referenced_type" : "type-269",
    "self_type" : "type-268",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2109,7 +2109,7 @@
    "referenced_type" : "type-82",
    "self_type" : "type-81",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2118,7 +2118,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-105",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2127,7 +2127,7 @@
    "referenced_type" : "type-117",
    "self_type" : "type-116",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2136,7 +2136,7 @@
    "referenced_type" : "type-128",
    "self_type" : "type-127",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2145,7 +2145,7 @@
    "referenced_type" : "type-148",
    "self_type" : "type-147",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2154,7 +2154,7 @@
    "referenced_type" : "type-171",
    "self_type" : "type-170",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2163,7 +2163,7 @@
    "referenced_type" : "type-19",
    "self_type" : "type-18",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2172,7 +2172,7 @@
    "referenced_type" : "type-202",
    "self_type" : "type-201",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2181,7 +2181,7 @@
    "referenced_type" : "type-211",
    "self_type" : "type-210",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2190,7 +2190,7 @@
    "referenced_type" : "type-242",
    "self_type" : "type-241",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2199,7 +2199,7 @@
    "referenced_type" : "type-274",
    "self_type" : "type-273",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2208,7 +2208,7 @@
    "referenced_type" : "type-285",
    "self_type" : "type-284",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2217,7 +2217,7 @@
    "referenced_type" : "type-293",
    "self_type" : "type-292",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2226,7 +2226,7 @@
    "referenced_type" : "type-301",
    "self_type" : "type-300",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2235,7 +2235,7 @@
    "referenced_type" : "type-311",
    "self_type" : "type-310",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2244,7 +2244,7 @@
    "referenced_type" : "type-319",
    "self_type" : "type-318",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2253,7 +2253,7 @@
    "referenced_type" : "type-330",
    "self_type" : "type-329",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2262,7 +2262,7 @@
    "referenced_type" : "type-335",
    "self_type" : "type-334",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2271,7 +2271,7 @@
    "referenced_type" : "type-53",
    "self_type" : "type-52",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2280,7 +2280,7 @@
    "referenced_type" : "type-91",
    "self_type" : "type-90",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2289,7 +2289,7 @@
    "referenced_type" : "type-147",
    "self_type" : "type-149",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2298,7 +2298,7 @@
    "referenced_type" : "type-201",
    "self_type" : "type-203",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2307,7 +2307,7 @@
    "referenced_type" : "type-334",
    "self_type" : "type-336",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2316,7 +2316,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-151",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2325,7 +2325,7 @@
    "referenced_type" : "type-9",
    "self_type" : "type-125",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2334,7 +2334,7 @@
    "referenced_type" : "type-73",
    "self_type" : "type-74",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2343,7 +2343,7 @@
    "referenced_type" : "type-255",
    "self_type" : "type-257",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2352,7 +2352,7 @@
    "referenced_type" : "type-278",
    "self_type" : "type-280",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2361,7 +2361,7 @@
    "referenced_type" : "type-70",
    "self_type" : "type-72",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2370,7 +2370,7 @@
    "referenced_type" : "type-95",
    "self_type" : "type-100",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2379,7 +2379,7 @@
    "referenced_type" : "type-152",
    "self_type" : "type-153",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2388,7 +2388,7 @@
    "referenced_type" : "type-12",
    "self_type" : "type-11",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2397,7 +2397,7 @@
    "referenced_type" : "type-11",
    "self_type" : "type-10",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2406,7 +2406,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-113",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2415,7 +2415,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-23",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2424,7 +2424,7 @@
    "referenced_type" : "type-49",
    "self_type" : "type-51",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "alignment" : 4,
@@ -2433,7 +2433,7 @@
    "referenced_type" : "type-133",
    "self_type" : "type-135",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2442,7 +2442,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-120",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2451,7 +2451,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-136",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2460,7 +2460,7 @@
    "referenced_type" : "type-186",
    "self_type" : "type-185",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2469,7 +2469,7 @@
    "referenced_type" : "type-228",
    "self_type" : "type-227",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2478,7 +2478,7 @@
    "referenced_type" : "type-38",
    "self_type" : "type-37",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2487,7 +2487,7 @@
    "referenced_type" : "type-34",
    "self_type" : "type-68",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2496,7 +2496,7 @@
    "referenced_type" : "type-188",
    "self_type" : "type-187",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2505,7 +2505,7 @@
    "referenced_type" : "type-230",
    "self_type" : "type-229",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2514,7 +2514,7 @@
    "referenced_type" : "type-42",
    "self_type" : "type-41",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2523,7 +2523,7 @@
    "referenced_type" : "type-2",
    "self_type" : "type-75",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2532,7 +2532,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-134",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "qualified_types" :
@@ -2543,7 +2543,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-8",
    "self_type" : "type-33",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2553,7 +2553,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-73",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "is_const" : true,
@@ -2561,7 +2561,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-256",
    "self_type" : "type-255",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2571,7 +2571,7 @@
    "referenced_type" : "type-279",
    "self_type" : "type-278",
    "size" : 116,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "is_const" : true,
@@ -2579,7 +2579,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-71",
    "self_type" : "type-70",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2589,7 +2589,7 @@
    "referenced_type" : "type-96",
    "self_type" : "type-95",
    "size" : 116,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2599,7 +2599,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-152",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2609,7 +2609,7 @@
    "referenced_type" : "type-9",
    "self_type" : "type-12",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2619,7 +2619,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-107",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -2629,7 +2629,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-16",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2639,7 +2639,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-108",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2649,7 +2649,7 @@
    "referenced_type" : "type-119",
    "self_type" : "type-118",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2659,7 +2659,7 @@
    "referenced_type" : "type-130",
    "self_type" : "type-129",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2669,7 +2669,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-155",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2679,7 +2679,7 @@
    "referenced_type" : "type-173",
    "self_type" : "type-172",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2689,7 +2689,7 @@
    "referenced_type" : "type-205",
    "self_type" : "type-204",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2699,7 +2699,7 @@
    "referenced_type" : "type-213",
    "self_type" : "type-212",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2709,7 +2709,7 @@
    "referenced_type" : "type-21",
    "self_type" : "type-20",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2719,7 +2719,7 @@
    "referenced_type" : "type-245",
    "self_type" : "type-244",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2729,7 +2729,7 @@
    "referenced_type" : "type-276",
    "self_type" : "type-275",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2739,7 +2739,7 @@
    "referenced_type" : "type-287",
    "self_type" : "type-286",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2749,7 +2749,7 @@
    "referenced_type" : "type-295",
    "self_type" : "type-294",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2759,7 +2759,7 @@
    "referenced_type" : "type-303",
    "self_type" : "type-302",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2769,7 +2769,7 @@
    "referenced_type" : "type-313",
    "self_type" : "type-312",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2779,7 +2779,7 @@
    "referenced_type" : "type-321",
    "self_type" : "type-320",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2789,7 +2789,7 @@
    "referenced_type" : "type-332",
    "self_type" : "type-331",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2799,7 +2799,7 @@
    "referenced_type" : "type-342",
    "self_type" : "type-341",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2809,7 +2809,7 @@
    "referenced_type" : "type-57",
    "self_type" : "type-56",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2819,7 +2819,7 @@
    "referenced_type" : "type-93",
    "self_type" : "type-92",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2829,7 +2829,7 @@
    "referenced_type" : "type-103",
    "self_type" : "type-102",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2839,7 +2839,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-111",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2849,7 +2849,7 @@
    "referenced_type" : "type-124",
    "self_type" : "type-123",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2859,7 +2859,7 @@
    "referenced_type" : "type-139",
    "self_type" : "type-138",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2869,7 +2869,7 @@
    "referenced_type" : "type-142",
    "self_type" : "type-141",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2879,7 +2879,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-14",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2889,7 +2889,7 @@
    "referenced_type" : "type-168",
    "self_type" : "type-167",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2899,7 +2899,7 @@
    "referenced_type" : "type-178",
    "self_type" : "type-177",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2909,7 +2909,7 @@
    "referenced_type" : "type-181",
    "self_type" : "type-180",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2919,7 +2919,7 @@
    "referenced_type" : "type-190",
    "self_type" : "type-189",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2929,7 +2929,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-193",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2939,7 +2939,7 @@
    "referenced_type" : "type-197",
    "self_type" : "type-196",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2949,7 +2949,7 @@
    "referenced_type" : "type-200",
    "self_type" : "type-199",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2959,7 +2959,7 @@
    "referenced_type" : "type-209",
    "self_type" : "type-208",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2969,7 +2969,7 @@
    "referenced_type" : "type-217",
    "self_type" : "type-216",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2979,7 +2979,7 @@
    "referenced_type" : "type-221",
    "self_type" : "type-220",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2989,7 +2989,7 @@
    "referenced_type" : "type-223",
    "self_type" : "type-222",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2999,7 +2999,7 @@
    "referenced_type" : "type-232",
    "self_type" : "type-231",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3009,7 +3009,7 @@
    "referenced_type" : "type-236",
    "self_type" : "type-235",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3019,7 +3019,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-248",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3029,7 +3029,7 @@
    "referenced_type" : "type-264",
    "self_type" : "type-263",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3039,7 +3039,7 @@
    "referenced_type" : "type-267",
    "self_type" : "type-266",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3049,7 +3049,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3059,7 +3059,7 @@
    "referenced_type" : "type-271",
    "self_type" : "type-270",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3069,7 +3069,7 @@
    "referenced_type" : "type-283",
    "self_type" : "type-282",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3079,7 +3079,7 @@
    "referenced_type" : "type-290",
    "self_type" : "type-289",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3089,7 +3089,7 @@
    "referenced_type" : "type-299",
    "self_type" : "type-298",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3099,7 +3099,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-28",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3109,7 +3109,7 @@
    "referenced_type" : "type-309",
    "self_type" : "type-308",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3119,7 +3119,7 @@
    "referenced_type" : "type-317",
    "self_type" : "type-316",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3129,7 +3129,7 @@
    "referenced_type" : "type-325",
    "self_type" : "type-324",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3139,7 +3139,7 @@
    "referenced_type" : "type-328",
    "self_type" : "type-327",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3149,7 +3149,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-43",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3159,7 +3159,7 @@
    "referenced_type" : "type-47",
    "self_type" : "type-46",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3169,7 +3169,7 @@
    "referenced_type" : "type-61",
    "self_type" : "type-60",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3179,7 +3179,7 @@
    "referenced_type" : "type-80",
    "self_type" : "type-79",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3189,7 +3189,7 @@
    "referenced_type" : "type-88",
    "self_type" : "type-87",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3199,7 +3199,7 @@
    "referenced_type" : "type-99",
    "self_type" : "type-98",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3209,7 +3209,7 @@
    "referenced_type" : "type-2",
    "self_type" : "type-131",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "is_const" : true,
@@ -3217,7 +3217,7 @@
    "name" : "const void",
    "referenced_type" : "type-50",
    "self_type" : "type-49",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   }
  ],
  "record_types" :
@@ -3281,7 +3281,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-65",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "unique_id" : "AndroidLogEntry_t"
   },
   {
@@ -3298,7 +3298,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-5",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_header_t"
   },
   {
@@ -3320,7 +3320,7 @@
    "referenced_type" : "type-160",
    "self_type" : "type-160",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_int_t"
   },
   {
@@ -3342,7 +3342,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-162",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_long_t"
   },
   {
@@ -3369,7 +3369,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-164",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_string_t"
   },
   {
@@ -3391,7 +3391,7 @@
    "referenced_type" : "type-161",
    "self_type" : "type-161",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_int_t"
   },
   {
@@ -3416,7 +3416,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-150",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
    "unique_id" : "_ZTS22android_log_event_list"
   },
   {
@@ -3438,7 +3438,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-163",
    "size" : 13,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_long_t"
   },
   {
@@ -3470,7 +3470,7 @@
    "referenced_type" : "type-4",
    "self_type" : "type-4",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_string_t"
   },
   {
@@ -3497,7 +3497,7 @@
    "referenced_type" : "type-159",
    "self_type" : "type-159",
    "size" : 11,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_header_t"
   },
   {
@@ -3529,7 +3529,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-143",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
    "unique_id" : "android_log_list_element"
   },
   {
@@ -3554,14 +3554,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3) at system/logging/liblog/include/log/log_event_list.h:53:3",
-   "name" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3) at system/logging/liblog/include/log/log_event_list.h:53:3",
+   "linker_set_key" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3) at system/core/liblog/include/log/log_event_list.h:53:3",
+   "name" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3) at system/core/liblog/include/log/log_event_list.h:53:3",
    "record_kind" : "union",
    "referenced_type" : "type-144",
    "self_type" : "type-144",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
-   "unique_id" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3)"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
+   "unique_id" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3)"
   },
   {
    "alignment" : 1,
@@ -3592,7 +3592,7 @@
    "referenced_type" : "type-158",
    "self_type" : "type-158",
    "size" : 7,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_pmsg_log_header_t"
   },
   {
@@ -3608,7 +3608,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-83",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -3641,14 +3641,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-84",
    "self_type" : "type-84",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -3669,7 +3669,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-17",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -3716,7 +3716,7 @@
    "referenced_type" : "type-34",
    "self_type" : "type-34",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -3768,7 +3768,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-54",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -3820,7 +3820,7 @@
    "referenced_type" : "type-62",
    "self_type" : "type-62",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -3877,7 +3877,7 @@
    "referenced_type" : "type-76",
    "self_type" : "type-76",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   }
  ],
diff --git a/29/32/x86/source-based/libmediandk.so.lsdump b/29/32/x86/source-based/libmediandk.so.lsdump
index 7039f59..6553a35 100644
--- a/29/32/x86/source-based/libmediandk.so.lsdump
+++ b/29/32/x86/source-based/libmediandk.so.lsdump
@@ -203,7 +203,7 @@
    "name" : "char []",
    "referenced_type" : "type-42",
    "self_type" : "type-2719",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -308,7 +308,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-2790",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -2036,7 +2036,7 @@
    "referenced_type" : "type-2851",
    "self_type" : "type-2851",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "AndroidEventLogType"
   },
@@ -4747,7 +4747,7 @@
    "referenced_type" : "type-2569",
    "self_type" : "type-2569",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "android_LogPriority"
   },
@@ -7229,7 +7229,7 @@
    "referenced_type" : "type-2603",
    "self_type" : "type-2603",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "log_id"
   },
@@ -13444,7 +13444,7 @@
    "referenced_type" : "type-2807",
    "self_type" : "type-2831",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -13453,7 +13453,7 @@
    "referenced_type" : "type-2689",
    "self_type" : "type-2708",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13561,7 +13561,7 @@
    "referenced_type" : "type-1065",
    "self_type" : "type-1067",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13570,7 +13570,7 @@
    "referenced_type" : "type-1359",
    "self_type" : "type-1361",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13579,7 +13579,7 @@
    "referenced_type" : "type-1469",
    "self_type" : "type-1471",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13588,7 +13588,7 @@
    "referenced_type" : "type-1492",
    "self_type" : "type-1495",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13597,7 +13597,7 @@
    "referenced_type" : "type-1637",
    "self_type" : "type-1646",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13606,7 +13606,7 @@
    "referenced_type" : "type-1680",
    "self_type" : "type-1688",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13615,7 +13615,7 @@
    "referenced_type" : "type-1731",
    "self_type" : "type-1733",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13624,7 +13624,7 @@
    "referenced_type" : "type-1779",
    "self_type" : "type-1781",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13633,7 +13633,7 @@
    "referenced_type" : "type-1868",
    "self_type" : "type-1867",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13642,7 +13642,7 @@
    "referenced_type" : "type-2300",
    "self_type" : "type-2299",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13651,7 +13651,7 @@
    "referenced_type" : "type-2655",
    "self_type" : "type-2680",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13660,7 +13660,7 @@
    "referenced_type" : "type-387",
    "self_type" : "type-389",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13669,7 +13669,7 @@
    "referenced_type" : "type-455",
    "self_type" : "type-457",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13678,7 +13678,7 @@
    "referenced_type" : "type-793",
    "self_type" : "type-799",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13687,7 +13687,7 @@
    "referenced_type" : "type-886",
    "self_type" : "type-890",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13696,7 +13696,7 @@
    "referenced_type" : "type-949",
    "self_type" : "type-951",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20125,7 +20125,7 @@
    "referenced_type" : "type-2807",
    "self_type" : "type-2830",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20134,7 +20134,7 @@
    "referenced_type" : "type-2689",
    "self_type" : "type-2698",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20638,7 +20638,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2841",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20647,7 +20647,7 @@
    "referenced_type" : "type-2630",
    "self_type" : "type-2669",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21264,7 +21264,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-2719",
    "self_type" : "type-2735",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -23844,7 +23844,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2807",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -23854,7 +23854,7 @@
    "referenced_type" : "type-2630",
    "self_type" : "type-2689",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25424,7 +25424,7 @@
    "referenced_type" : "type-1066",
    "self_type" : "type-1065",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25434,7 +25434,7 @@
    "referenced_type" : "type-1360",
    "self_type" : "type-1359",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25444,7 +25444,7 @@
    "referenced_type" : "type-1470",
    "self_type" : "type-1469",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25454,7 +25454,7 @@
    "referenced_type" : "type-1493",
    "self_type" : "type-1492",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25464,7 +25464,7 @@
    "referenced_type" : "type-1638",
    "self_type" : "type-1637",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25474,7 +25474,7 @@
    "referenced_type" : "type-1681",
    "self_type" : "type-1680",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25484,7 +25484,7 @@
    "referenced_type" : "type-1732",
    "self_type" : "type-1731",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25494,7 +25494,7 @@
    "referenced_type" : "type-1780",
    "self_type" : "type-1779",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25504,7 +25504,7 @@
    "referenced_type" : "type-1869",
    "self_type" : "type-1868",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25514,7 +25514,7 @@
    "referenced_type" : "type-2301",
    "self_type" : "type-2300",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25524,7 +25524,7 @@
    "referenced_type" : "type-2656",
    "self_type" : "type-2655",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25534,7 +25534,7 @@
    "referenced_type" : "type-388",
    "self_type" : "type-387",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25544,7 +25544,7 @@
    "referenced_type" : "type-456",
    "self_type" : "type-455",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25554,7 +25554,7 @@
    "referenced_type" : "type-794",
    "self_type" : "type-793",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25564,7 +25564,7 @@
    "referenced_type" : "type-887",
    "self_type" : "type-886",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25574,7 +25574,7 @@
    "referenced_type" : "type-950",
    "self_type" : "type-949",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -25594,7 +25594,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-195",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -49210,7 +49210,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2788",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -49243,14 +49243,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2789",
    "self_type" : "type-2789",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -49271,7 +49271,7 @@
    "referenced_type" : "type-2630",
    "self_type" : "type-2630",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -49318,7 +49318,7 @@
    "referenced_type" : "type-2742",
    "self_type" : "type-2742",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -49370,7 +49370,7 @@
    "referenced_type" : "type-2763",
    "self_type" : "type-2763",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -49422,7 +49422,7 @@
    "referenced_type" : "type-2775",
    "self_type" : "type-2775",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -49479,7 +49479,7 @@
    "referenced_type" : "type-2778",
    "self_type" : "type-2778",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/32/x86/source-based/libstdc++.so.lsdump b/29/32/x86/source-based/libstdc++.so.lsdump
index 739ceb0..8694323 100644
--- a/29/32/x86/source-based/libstdc++.so.lsdump
+++ b/29/32/x86/source-based/libstdc++.so.lsdump
@@ -495,7 +495,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-106",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-7",
    "unique_id" : "android_LogPriority"
   },
@@ -549,7 +549,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-107",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-7",
    "unique_id" : "log_id"
   },
diff --git a/29/64/arm64_armv8-a/source-based/libOpenMAXAL.so.lsdump b/29/64/arm64_armv8-a/source-based/libOpenMAXAL.so.lsdump
index 2c869eb..9c772b2 100644
--- a/29/64/arm64_armv8-a/source-based/libOpenMAXAL.so.lsdump
+++ b/29/64/arm64_armv8-a/source-based/libOpenMAXAL.so.lsdump
@@ -105,7 +105,7 @@
    "name" : "char []",
    "referenced_type" : "type-145",
    "self_type" : "type-816",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -218,7 +218,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-2597",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1018,7 +1018,7 @@
    "referenced_type" : "type-2615",
    "self_type" : "type-2615",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -2555,7 +2555,7 @@
    "referenced_type" : "type-2576",
    "self_type" : "type-2576",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -5029,7 +5029,7 @@
    "referenced_type" : "type-2577",
    "self_type" : "type-2577",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -15894,7 +15894,7 @@
    "referenced_type" : "type-2611",
    "self_type" : "type-2613",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -15903,7 +15903,7 @@
    "referenced_type" : "type-2583",
    "self_type" : "type-2585",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -16011,7 +16011,7 @@
    "referenced_type" : "type-2176",
    "self_type" : "type-2178",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -16020,7 +16020,7 @@
    "referenced_type" : "type-2361",
    "self_type" : "type-2360",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -16029,7 +16029,7 @@
    "referenced_type" : "type-2579",
    "self_type" : "type-2582",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -18057,7 +18057,7 @@
    "referenced_type" : "type-145",
    "self_type" : "type-364",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20532,7 +20532,7 @@
    "referenced_type" : "type-165",
    "self_type" : "type-164",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -20577,7 +20577,7 @@
    "referenced_type" : "type-2611",
    "self_type" : "type-2612",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20586,7 +20586,7 @@
    "referenced_type" : "type-2583",
    "self_type" : "type-2584",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -20829,7 +20829,7 @@
    "referenced_type" : "type-2595",
    "self_type" : "type-2614",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20838,7 +20838,7 @@
    "referenced_type" : "type-2578",
    "self_type" : "type-2581",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25109,7 +25109,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-816",
    "self_type" : "type-2586",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -27995,7 +27995,7 @@
    "referenced_type" : "type-145",
    "self_type" : "type-165",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28065,7 +28065,7 @@
    "referenced_type" : "type-2595",
    "self_type" : "type-2611",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28075,7 +28075,7 @@
    "referenced_type" : "type-2578",
    "self_type" : "type-2583",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28205,7 +28205,7 @@
    "referenced_type" : "type-2177",
    "self_type" : "type-2176",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28215,7 +28215,7 @@
    "referenced_type" : "type-2362",
    "self_type" : "type-2361",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28225,7 +28225,7 @@
    "referenced_type" : "type-2580",
    "self_type" : "type-2579",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -60172,7 +60172,7 @@
    "referenced_type" : "type-2595",
    "self_type" : "type-2595",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -60205,14 +60205,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2596",
    "self_type" : "type-2596",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -60233,7 +60233,7 @@
    "referenced_type" : "type-2578",
    "self_type" : "type-2578",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -60280,7 +60280,7 @@
    "referenced_type" : "type-2587",
    "self_type" : "type-2587",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -60332,7 +60332,7 @@
    "referenced_type" : "type-2589",
    "self_type" : "type-2589",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -60384,7 +60384,7 @@
    "referenced_type" : "type-2591",
    "self_type" : "type-2591",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -60441,7 +60441,7 @@
    "referenced_type" : "type-2593",
    "self_type" : "type-2593",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/arm64_armv8-a/source-based/libOpenSLES.so.lsdump b/29/64/arm64_armv8-a/source-based/libOpenSLES.so.lsdump
index 5ea699b..2e31c02 100644
--- a/29/64/arm64_armv8-a/source-based/libOpenSLES.so.lsdump
+++ b/29/64/arm64_armv8-a/source-based/libOpenSLES.so.lsdump
@@ -105,7 +105,7 @@
    "name" : "char []",
    "referenced_type" : "type-145",
    "self_type" : "type-816",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -218,7 +218,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-2597",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1054,7 +1054,7 @@
    "referenced_type" : "type-2615",
    "self_type" : "type-2615",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -2591,7 +2591,7 @@
    "referenced_type" : "type-2576",
    "self_type" : "type-2576",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -5065,7 +5065,7 @@
    "referenced_type" : "type-2577",
    "self_type" : "type-2577",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -16002,7 +16002,7 @@
    "referenced_type" : "type-2611",
    "self_type" : "type-2613",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -16011,7 +16011,7 @@
    "referenced_type" : "type-2583",
    "self_type" : "type-2585",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -16119,7 +16119,7 @@
    "referenced_type" : "type-2176",
    "self_type" : "type-2178",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -16128,7 +16128,7 @@
    "referenced_type" : "type-2361",
    "self_type" : "type-2360",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -16137,7 +16137,7 @@
    "referenced_type" : "type-2579",
    "self_type" : "type-2582",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -18165,7 +18165,7 @@
    "referenced_type" : "type-145",
    "self_type" : "type-364",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20640,7 +20640,7 @@
    "referenced_type" : "type-165",
    "self_type" : "type-164",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -20685,7 +20685,7 @@
    "referenced_type" : "type-2611",
    "self_type" : "type-2612",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20694,7 +20694,7 @@
    "referenced_type" : "type-2583",
    "self_type" : "type-2584",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -20937,7 +20937,7 @@
    "referenced_type" : "type-2595",
    "self_type" : "type-2614",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20946,7 +20946,7 @@
    "referenced_type" : "type-2578",
    "self_type" : "type-2581",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25217,7 +25217,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-816",
    "self_type" : "type-2586",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28103,7 +28103,7 @@
    "referenced_type" : "type-145",
    "self_type" : "type-165",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28173,7 +28173,7 @@
    "referenced_type" : "type-2595",
    "self_type" : "type-2611",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28183,7 +28183,7 @@
    "referenced_type" : "type-2578",
    "self_type" : "type-2583",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28313,7 +28313,7 @@
    "referenced_type" : "type-2177",
    "self_type" : "type-2176",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28323,7 +28323,7 @@
    "referenced_type" : "type-2362",
    "self_type" : "type-2361",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28333,7 +28333,7 @@
    "referenced_type" : "type-2580",
    "self_type" : "type-2579",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -60280,7 +60280,7 @@
    "referenced_type" : "type-2595",
    "self_type" : "type-2595",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -60313,14 +60313,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2596",
    "self_type" : "type-2596",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -60341,7 +60341,7 @@
    "referenced_type" : "type-2578",
    "self_type" : "type-2578",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -60388,7 +60388,7 @@
    "referenced_type" : "type-2587",
    "self_type" : "type-2587",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -60440,7 +60440,7 @@
    "referenced_type" : "type-2589",
    "self_type" : "type-2589",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -60492,7 +60492,7 @@
    "referenced_type" : "type-2591",
    "self_type" : "type-2591",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -60549,7 +60549,7 @@
    "referenced_type" : "type-2593",
    "self_type" : "type-2593",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/arm64_armv8-a/source-based/libRS.so.lsdump b/29/64/arm64_armv8-a/source-based/libRS.so.lsdump
index 293a727..9048a29 100644
--- a/29/64/arm64_armv8-a/source-based/libRS.so.lsdump
+++ b/29/64/arm64_armv8-a/source-based/libRS.so.lsdump
@@ -364,7 +364,7 @@
    "name" : "char []",
    "referenced_type" : "type-5",
    "self_type" : "type-4259",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 2,
@@ -588,7 +588,7 @@
    "referenced_type" : "type-21",
    "self_type" : "type-4274",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1280,7 +1280,7 @@
    "referenced_type" : "type-4279",
    "self_type" : "type-4279",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "AndroidEventLogType"
   },
@@ -4170,7 +4170,7 @@
    "referenced_type" : "type-4238",
    "self_type" : "type-4238",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "android_LogPriority"
   },
@@ -4304,7 +4304,7 @@
    "referenced_type" : "type-4239",
    "self_type" : "type-4239",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "log_id"
   },
@@ -16267,7 +16267,7 @@
    "referenced_type" : "type-4275",
    "self_type" : "type-4277",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -16276,7 +16276,7 @@
    "referenced_type" : "type-4256",
    "self_type" : "type-4258",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -17257,7 +17257,7 @@
    "referenced_type" : "type-4251",
    "self_type" : "type-4255",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -17266,7 +17266,7 @@
    "referenced_type" : "type-7100",
    "self_type" : "type-7101",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "linker_set_key" : "const uniform_int_distribution<_IntType> &",
@@ -19866,7 +19866,7 @@
    "referenced_type" : "type-4275",
    "self_type" : "type-4276",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -19875,7 +19875,7 @@
    "referenced_type" : "type-4256",
    "self_type" : "type-4257",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -21873,7 +21873,7 @@
    "referenced_type" : "type-4272",
    "self_type" : "type-4278",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -21882,7 +21882,7 @@
    "referenced_type" : "type-4250",
    "self_type" : "type-4254",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -26403,7 +26403,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-4259",
    "self_type" : "type-4260",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -27165,7 +27165,7 @@
    "referenced_type" : "type-4272",
    "self_type" : "type-4275",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -27175,7 +27175,7 @@
    "referenced_type" : "type-4250",
    "self_type" : "type-4256",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -29421,7 +29421,7 @@
    "referenced_type" : "type-2641",
    "self_type" : "type-4251",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -29431,7 +29431,7 @@
    "referenced_type" : "type-7094",
    "self_type" : "type-7100",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -36563,7 +36563,7 @@
    "referenced_type" : "type-4272",
    "self_type" : "type-4272",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -36596,14 +36596,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-4273",
    "self_type" : "type-4273",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -36624,7 +36624,7 @@
    "referenced_type" : "type-4250",
    "self_type" : "type-4250",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -36671,7 +36671,7 @@
    "referenced_type" : "type-4261",
    "self_type" : "type-4261",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -36723,7 +36723,7 @@
    "referenced_type" : "type-4263",
    "self_type" : "type-4263",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -36775,7 +36775,7 @@
    "referenced_type" : "type-4267",
    "self_type" : "type-4267",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -36832,7 +36832,7 @@
    "referenced_type" : "type-4269",
    "self_type" : "type-4269",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/arm64_armv8-a/source-based/liblog.so.lsdump b/29/64/arm64_armv8-a/source-based/liblog.so.lsdump
index 8126b00..f318248 100644
--- a/29/64/arm64_armv8-a/source-based/liblog.so.lsdump
+++ b/29/64/arm64_armv8-a/source-based/liblog.so.lsdump
@@ -6,7 +6,7 @@
    "name" : "char []",
    "referenced_type" : "type-9",
    "self_type" : "type-8",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -15,7 +15,7 @@
    "referenced_type" : "type-85",
    "self_type" : "type-84",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   }
  ],
  "builtin_types" :
@@ -334,7 +334,7 @@
    "referenced_type" : "type-125",
    "self_type" : "type-125",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -424,7 +424,7 @@
    "referenced_type" : "type-62",
    "self_type" : "type-62",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidLogPrintFormat"
   },
@@ -474,7 +474,7 @@
    "referenced_type" : "type-1",
    "self_type" : "type-1",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -528,7 +528,7 @@
    "referenced_type" : "type-103",
    "self_type" : "type-103",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -582,7 +582,7 @@
    "referenced_type" : "type-32",
    "self_type" : "type-32",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_id.h",
+   "source_file" : "/system/core/liblog/include/log/log_id.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   }
@@ -617,7 +617,7 @@
    "referenced_type" : "type-132",
    "return_type" : "type-64",
    "self_type" : "type-132",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "functions" :
@@ -638,7 +638,7 @@
     }
    ],
    "return_type" : "type-48",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bswrite",
@@ -653,7 +653,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_btwrite",
@@ -674,7 +674,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_buf_print",
@@ -695,7 +695,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_buf_write",
@@ -716,7 +716,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bwrite",
@@ -734,13 +734,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_close",
    "linker_set_key" : "__android_log_close",
    "return_type" : "type-48",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_error_write",
@@ -764,13 +764,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_safetynet.h"
+   "source_file" : "/system/core/liblog/include/log/log_safetynet.h"
   },
   {
    "function_name" : "__android_log_is_debuggable",
    "linker_set_key" : "__android_log_is_debuggable",
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_properties.h"
+   "source_file" : "/system/core/liblog/include/log/log_properties.h"
   },
   {
    "function_name" : "__android_log_is_loggable",
@@ -788,7 +788,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_main.h"
+   "source_file" : "/system/core/liblog/include/log/log_main.h"
   },
   {
    "function_name" : "__android_log_is_loggable_len",
@@ -809,7 +809,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_main.h"
+   "source_file" : "/system/core/liblog/include/log/log_main.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_read",
@@ -833,7 +833,7 @@
     }
    ],
    "return_type" : "type-64",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_write",
@@ -857,7 +857,7 @@
     }
    ],
    "return_type" : "type-64",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_print",
@@ -875,13 +875,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_security",
    "linker_set_key" : "__android_log_security",
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_security_bswrite",
@@ -896,7 +896,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_vprint",
@@ -917,7 +917,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write",
@@ -935,7 +935,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_logger_get_buffer_size",
@@ -947,7 +947,7 @@
     }
    ],
    "return_type" : "type-30",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_logger_property_get_bool",
@@ -962,7 +962,7 @@
     }
    ],
    "return_type" : "type-3",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_destroy",
@@ -974,7 +974,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_id_to_name",
@@ -986,7 +986,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_log_parser_reset",
@@ -1004,7 +1004,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_processBinaryLogBuffer",
@@ -1028,7 +1028,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_processLogBuffer",
@@ -1043,7 +1043,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_read_next",
@@ -1055,7 +1055,7 @@
     }
    ],
    "return_type" : "type-142",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_reset",
@@ -1067,7 +1067,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_float32",
@@ -1082,7 +1082,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int32",
@@ -1097,7 +1097,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int64",
@@ -1112,7 +1112,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list",
@@ -1127,7 +1127,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_begin",
@@ -1139,7 +1139,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_buffer",
@@ -1154,7 +1154,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_write_list_end",
@@ -1166,7 +1166,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8",
@@ -1181,7 +1181,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8_len",
@@ -1199,7 +1199,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_logger_clear",
@@ -1211,7 +1211,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_id",
@@ -1223,7 +1223,7 @@
     }
    ],
    "return_type" : "type-32",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_readable_size",
@@ -1235,7 +1235,7 @@
     }
    ],
    "return_type" : "type-64",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_size",
@@ -1247,7 +1247,7 @@
     }
    ],
    "return_type" : "type-64",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_version",
@@ -1259,7 +1259,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_prune_list",
@@ -1277,7 +1277,7 @@
     }
    ],
    "return_type" : "type-64",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_statistics",
@@ -1295,7 +1295,7 @@
     }
    ],
    "return_type" : "type-64",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc",
@@ -1313,7 +1313,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc_time",
@@ -1331,7 +1331,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_free",
@@ -1343,7 +1343,7 @@
     }
    ],
    "return_type" : "type-48",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_open",
@@ -1364,7 +1364,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_read",
@@ -1379,7 +1379,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_open",
@@ -1394,7 +1394,7 @@
     }
    ],
    "return_type" : "type-37",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_log_size",
@@ -1409,7 +1409,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_prune_list",
@@ -1427,7 +1427,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_lookupEventTagNum",
@@ -1448,7 +1448,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "android_name_to_log_id",
@@ -1460,7 +1460,7 @@
     }
    ],
    "return_type" : "type-103",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_openEventTagMap",
@@ -1472,7 +1472,7 @@
     }
    ],
    "return_type" : "type-80",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "create_android_log_parser",
@@ -1487,7 +1487,7 @@
     }
    ],
    "return_type" : "type-145",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "create_android_logger",
@@ -1499,7 +1499,7 @@
     }
    ],
    "return_type" : "type-145",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "global_vars" : [],
@@ -1512,7 +1512,7 @@
    "referenced_type" : "type-148",
    "self_type" : "type-152",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1521,7 +1521,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-114",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -1530,7 +1530,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-27",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1539,7 +1539,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-109",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1548,7 +1548,7 @@
    "referenced_type" : "type-117",
    "self_type" : "type-120",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1557,7 +1557,7 @@
    "referenced_type" : "type-128",
    "self_type" : "type-130",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1566,7 +1566,7 @@
    "referenced_type" : "type-153",
    "self_type" : "type-155",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1575,7 +1575,7 @@
    "referenced_type" : "type-171",
    "self_type" : "type-173",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1584,7 +1584,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-22",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1593,7 +1593,7 @@
    "referenced_type" : "type-203",
    "self_type" : "type-205",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1602,7 +1602,7 @@
    "referenced_type" : "type-211",
    "self_type" : "type-213",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1611,7 +1611,7 @@
    "referenced_type" : "type-243",
    "self_type" : "type-245",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1620,7 +1620,7 @@
    "referenced_type" : "type-274",
    "self_type" : "type-276",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1629,7 +1629,7 @@
    "referenced_type" : "type-285",
    "self_type" : "type-287",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1638,7 +1638,7 @@
    "referenced_type" : "type-293",
    "self_type" : "type-295",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1647,7 +1647,7 @@
    "referenced_type" : "type-301",
    "self_type" : "type-303",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1656,7 +1656,7 @@
    "referenced_type" : "type-311",
    "self_type" : "type-313",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1665,7 +1665,7 @@
    "referenced_type" : "type-319",
    "self_type" : "type-321",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1674,7 +1674,7 @@
    "referenced_type" : "type-330",
    "self_type" : "type-332",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1683,7 +1683,7 @@
    "referenced_type" : "type-340",
    "self_type" : "type-342",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1692,7 +1692,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-56",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1701,7 +1701,7 @@
    "referenced_type" : "type-91",
    "self_type" : "type-93",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1710,7 +1710,7 @@
    "referenced_type" : "type-101",
    "self_type" : "type-100",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1719,7 +1719,7 @@
    "referenced_type" : "type-110",
    "self_type" : "type-113",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1728,7 +1728,7 @@
    "referenced_type" : "type-122",
    "self_type" : "type-121",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1737,7 +1737,7 @@
    "referenced_type" : "type-137",
    "self_type" : "type-136",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1746,7 +1746,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1755,7 +1755,7 @@
    "referenced_type" : "type-140",
    "self_type" : "type-139",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1764,7 +1764,7 @@
    "referenced_type" : "type-166",
    "self_type" : "type-165",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1773,7 +1773,7 @@
    "referenced_type" : "type-176",
    "self_type" : "type-175",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1782,7 +1782,7 @@
    "referenced_type" : "type-179",
    "self_type" : "type-181",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1791,7 +1791,7 @@
    "referenced_type" : "type-188",
    "self_type" : "type-190",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1800,7 +1800,7 @@
    "referenced_type" : "type-192",
    "self_type" : "type-191",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1809,7 +1809,7 @@
    "referenced_type" : "type-195",
    "self_type" : "type-194",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1818,7 +1818,7 @@
    "referenced_type" : "type-198",
    "self_type" : "type-197",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1827,7 +1827,7 @@
    "referenced_type" : "type-207",
    "self_type" : "type-206",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1836,7 +1836,7 @@
    "referenced_type" : "type-215",
    "self_type" : "type-214",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1845,7 +1845,7 @@
    "referenced_type" : "type-218",
    "self_type" : "type-223",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1854,7 +1854,7 @@
    "referenced_type" : "type-221",
    "self_type" : "type-220",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1863,7 +1863,7 @@
    "referenced_type" : "type-230",
    "self_type" : "type-232",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1872,7 +1872,7 @@
    "referenced_type" : "type-234",
    "self_type" : "type-236",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1881,7 +1881,7 @@
    "referenced_type" : "type-247",
    "self_type" : "type-246",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1890,7 +1890,7 @@
    "referenced_type" : "type-25",
    "self_type" : "type-24",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1899,7 +1899,7 @@
    "referenced_type" : "type-261",
    "self_type" : "type-260",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1908,7 +1908,7 @@
    "referenced_type" : "type-265",
    "self_type" : "type-264",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1917,7 +1917,7 @@
    "referenced_type" : "type-269",
    "self_type" : "type-271",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1926,7 +1926,7 @@
    "referenced_type" : "type-28",
    "self_type" : "type-31",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1935,7 +1935,7 @@
    "referenced_type" : "type-281",
    "self_type" : "type-280",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1944,7 +1944,7 @@
    "referenced_type" : "type-288",
    "self_type" : "type-290",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1953,7 +1953,7 @@
    "referenced_type" : "type-297",
    "self_type" : "type-296",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1962,7 +1962,7 @@
    "referenced_type" : "type-307",
    "self_type" : "type-306",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1971,7 +1971,7 @@
    "referenced_type" : "type-315",
    "self_type" : "type-314",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1980,7 +1980,7 @@
    "referenced_type" : "type-323",
    "self_type" : "type-322",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1989,7 +1989,7 @@
    "referenced_type" : "type-326",
    "self_type" : "type-325",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1998,7 +1998,7 @@
    "referenced_type" : "type-41",
    "self_type" : "type-43",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2007,7 +2007,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-46",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2016,7 +2016,7 @@
    "referenced_type" : "type-58",
    "self_type" : "type-57",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2025,7 +2025,7 @@
    "referenced_type" : "type-76",
    "self_type" : "type-75",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2034,7 +2034,7 @@
    "referenced_type" : "type-86",
    "self_type" : "type-88",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2043,7 +2043,7 @@
    "referenced_type" : "type-98",
    "self_type" : "type-97",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   }
  ],
  "pointer_types" :
@@ -2055,7 +2055,7 @@
    "referenced_type" : "type-63",
    "self_type" : "type-68",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2064,7 +2064,7 @@
    "referenced_type" : "type-251",
    "self_type" : "type-250",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2073,7 +2073,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-65",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2082,7 +2082,7 @@
    "referenced_type" : "type-268",
    "self_type" : "type-267",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 8,
@@ -2091,7 +2091,7 @@
    "referenced_type" : "type-81",
    "self_type" : "type-80",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 8,
@@ -2100,7 +2100,7 @@
    "referenced_type" : "type-105",
    "self_type" : "type-104",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2109,7 +2109,7 @@
    "referenced_type" : "type-116",
    "self_type" : "type-115",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2118,7 +2118,7 @@
    "referenced_type" : "type-127",
    "self_type" : "type-126",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2127,7 +2127,7 @@
    "referenced_type" : "type-146",
    "self_type" : "type-145",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2136,7 +2136,7 @@
    "referenced_type" : "type-170",
    "self_type" : "type-169",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2145,7 +2145,7 @@
    "referenced_type" : "type-19",
    "self_type" : "type-18",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2154,7 +2154,7 @@
    "referenced_type" : "type-201",
    "self_type" : "type-200",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2163,7 +2163,7 @@
    "referenced_type" : "type-210",
    "self_type" : "type-209",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2172,7 +2172,7 @@
    "referenced_type" : "type-241",
    "self_type" : "type-240",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2181,7 +2181,7 @@
    "referenced_type" : "type-273",
    "self_type" : "type-272",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2190,7 +2190,7 @@
    "referenced_type" : "type-284",
    "self_type" : "type-283",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2199,7 +2199,7 @@
    "referenced_type" : "type-292",
    "self_type" : "type-291",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2208,7 +2208,7 @@
    "referenced_type" : "type-300",
    "self_type" : "type-299",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2217,7 +2217,7 @@
    "referenced_type" : "type-310",
    "self_type" : "type-309",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2226,7 +2226,7 @@
    "referenced_type" : "type-318",
    "self_type" : "type-317",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2235,7 +2235,7 @@
    "referenced_type" : "type-329",
    "self_type" : "type-328",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2244,7 +2244,7 @@
    "referenced_type" : "type-334",
    "self_type" : "type-333",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2253,7 +2253,7 @@
    "referenced_type" : "type-51",
    "self_type" : "type-50",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2262,7 +2262,7 @@
    "referenced_type" : "type-90",
    "self_type" : "type-89",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2271,7 +2271,7 @@
    "referenced_type" : "type-145",
    "self_type" : "type-147",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2280,7 +2280,7 @@
    "referenced_type" : "type-200",
    "self_type" : "type-202",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2289,7 +2289,7 @@
    "referenced_type" : "type-333",
    "self_type" : "type-335",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2298,7 +2298,7 @@
    "referenced_type" : "type-148",
    "self_type" : "type-149",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2307,7 +2307,7 @@
    "referenced_type" : "type-9",
    "self_type" : "type-124",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2316,7 +2316,7 @@
    "referenced_type" : "type-72",
    "self_type" : "type-73",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2325,7 +2325,7 @@
    "referenced_type" : "type-254",
    "self_type" : "type-256",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2334,7 +2334,7 @@
    "referenced_type" : "type-277",
    "self_type" : "type-279",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 8,
@@ -2343,7 +2343,7 @@
    "referenced_type" : "type-69",
    "self_type" : "type-71",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2352,7 +2352,7 @@
    "referenced_type" : "type-94",
    "self_type" : "type-96",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 8,
@@ -2361,7 +2361,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-151",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2370,7 +2370,7 @@
    "referenced_type" : "type-12",
    "self_type" : "type-11",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2379,7 +2379,7 @@
    "referenced_type" : "type-11",
    "self_type" : "type-10",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -2388,7 +2388,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-112",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2397,7 +2397,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-23",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2406,7 +2406,7 @@
    "referenced_type" : "type-47",
    "self_type" : "type-49",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "alignment" : 8,
@@ -2415,7 +2415,7 @@
    "referenced_type" : "type-82",
    "self_type" : "type-119",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2424,7 +2424,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-135",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2433,7 +2433,7 @@
    "referenced_type" : "type-185",
    "self_type" : "type-184",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2442,7 +2442,7 @@
    "referenced_type" : "type-227",
    "self_type" : "type-226",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2451,7 +2451,7 @@
    "referenced_type" : "type-38",
    "self_type" : "type-37",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2460,7 +2460,7 @@
    "referenced_type" : "type-34",
    "self_type" : "type-67",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2469,7 +2469,7 @@
    "referenced_type" : "type-187",
    "self_type" : "type-186",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2478,7 +2478,7 @@
    "referenced_type" : "type-229",
    "self_type" : "type-228",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2487,7 +2487,7 @@
    "referenced_type" : "type-40",
    "self_type" : "type-39",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2496,7 +2496,7 @@
    "referenced_type" : "type-132",
    "self_type" : "type-134",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -2505,7 +2505,7 @@
    "referenced_type" : "type-30",
    "self_type" : "type-74",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2514,7 +2514,7 @@
    "referenced_type" : "type-48",
    "self_type" : "type-133",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "qualified_types" :
@@ -2525,7 +2525,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-8",
    "self_type" : "type-33",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2535,7 +2535,7 @@
    "referenced_type" : "type-63",
    "self_type" : "type-72",
    "size" : 64,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "is_const" : true,
@@ -2543,7 +2543,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-255",
    "self_type" : "type-254",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2553,7 +2553,7 @@
    "referenced_type" : "type-278",
    "self_type" : "type-277",
    "size" : 208,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "is_const" : true,
@@ -2561,7 +2561,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-70",
    "self_type" : "type-69",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2571,7 +2571,7 @@
    "referenced_type" : "type-95",
    "self_type" : "type-94",
    "size" : 208,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 8,
@@ -2581,7 +2581,7 @@
    "referenced_type" : "type-148",
    "self_type" : "type-150",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2591,7 +2591,7 @@
    "referenced_type" : "type-9",
    "self_type" : "type-12",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2601,7 +2601,7 @@
    "referenced_type" : "type-82",
    "self_type" : "type-106",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -2611,7 +2611,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-16",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2621,7 +2621,7 @@
    "referenced_type" : "type-108",
    "self_type" : "type-107",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2631,7 +2631,7 @@
    "referenced_type" : "type-118",
    "self_type" : "type-117",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2641,7 +2641,7 @@
    "referenced_type" : "type-129",
    "self_type" : "type-128",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2651,7 +2651,7 @@
    "referenced_type" : "type-154",
    "self_type" : "type-153",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2661,7 +2661,7 @@
    "referenced_type" : "type-172",
    "self_type" : "type-171",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2671,7 +2671,7 @@
    "referenced_type" : "type-204",
    "self_type" : "type-203",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2681,7 +2681,7 @@
    "referenced_type" : "type-212",
    "self_type" : "type-211",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2691,7 +2691,7 @@
    "referenced_type" : "type-21",
    "self_type" : "type-20",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2701,7 +2701,7 @@
    "referenced_type" : "type-244",
    "self_type" : "type-243",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2711,7 +2711,7 @@
    "referenced_type" : "type-275",
    "self_type" : "type-274",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2721,7 +2721,7 @@
    "referenced_type" : "type-286",
    "self_type" : "type-285",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2731,7 +2731,7 @@
    "referenced_type" : "type-294",
    "self_type" : "type-293",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2741,7 +2741,7 @@
    "referenced_type" : "type-302",
    "self_type" : "type-301",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2751,7 +2751,7 @@
    "referenced_type" : "type-312",
    "self_type" : "type-311",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2761,7 +2761,7 @@
    "referenced_type" : "type-320",
    "self_type" : "type-319",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2771,7 +2771,7 @@
    "referenced_type" : "type-331",
    "self_type" : "type-330",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2781,7 +2781,7 @@
    "referenced_type" : "type-341",
    "self_type" : "type-340",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2791,7 +2791,7 @@
    "referenced_type" : "type-55",
    "self_type" : "type-54",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2801,7 +2801,7 @@
    "referenced_type" : "type-92",
    "self_type" : "type-91",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2811,7 +2811,7 @@
    "referenced_type" : "type-102",
    "self_type" : "type-101",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2821,7 +2821,7 @@
    "referenced_type" : "type-111",
    "self_type" : "type-110",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2831,7 +2831,7 @@
    "referenced_type" : "type-123",
    "self_type" : "type-122",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2841,7 +2841,7 @@
    "referenced_type" : "type-138",
    "self_type" : "type-137",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2851,7 +2851,7 @@
    "referenced_type" : "type-141",
    "self_type" : "type-140",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2861,7 +2861,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-14",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2871,7 +2871,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-166",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2881,7 +2881,7 @@
    "referenced_type" : "type-177",
    "self_type" : "type-176",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2891,7 +2891,7 @@
    "referenced_type" : "type-180",
    "self_type" : "type-179",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2901,7 +2901,7 @@
    "referenced_type" : "type-189",
    "self_type" : "type-188",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2911,7 +2911,7 @@
    "referenced_type" : "type-193",
    "self_type" : "type-192",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2921,7 +2921,7 @@
    "referenced_type" : "type-196",
    "self_type" : "type-195",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2931,7 +2931,7 @@
    "referenced_type" : "type-199",
    "self_type" : "type-198",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2941,7 +2941,7 @@
    "referenced_type" : "type-208",
    "self_type" : "type-207",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2951,7 +2951,7 @@
    "referenced_type" : "type-216",
    "self_type" : "type-215",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2961,7 +2961,7 @@
    "referenced_type" : "type-219",
    "self_type" : "type-218",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2971,7 +2971,7 @@
    "referenced_type" : "type-222",
    "self_type" : "type-221",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2981,7 +2981,7 @@
    "referenced_type" : "type-231",
    "self_type" : "type-230",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2991,7 +2991,7 @@
    "referenced_type" : "type-235",
    "self_type" : "type-234",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3001,7 +3001,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-247",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3011,7 +3011,7 @@
    "referenced_type" : "type-262",
    "self_type" : "type-261",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3021,7 +3021,7 @@
    "referenced_type" : "type-266",
    "self_type" : "type-265",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3031,7 +3031,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3041,7 +3041,7 @@
    "referenced_type" : "type-270",
    "self_type" : "type-269",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3051,7 +3051,7 @@
    "referenced_type" : "type-282",
    "self_type" : "type-281",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3061,7 +3061,7 @@
    "referenced_type" : "type-289",
    "self_type" : "type-288",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3071,7 +3071,7 @@
    "referenced_type" : "type-298",
    "self_type" : "type-297",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3081,7 +3081,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-28",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3091,7 +3091,7 @@
    "referenced_type" : "type-308",
    "self_type" : "type-307",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3101,7 +3101,7 @@
    "referenced_type" : "type-316",
    "self_type" : "type-315",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3111,7 +3111,7 @@
    "referenced_type" : "type-324",
    "self_type" : "type-323",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3121,7 +3121,7 @@
    "referenced_type" : "type-327",
    "self_type" : "type-326",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3131,7 +3131,7 @@
    "referenced_type" : "type-42",
    "self_type" : "type-41",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3141,7 +3141,7 @@
    "referenced_type" : "type-45",
    "self_type" : "type-44",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3151,7 +3151,7 @@
    "referenced_type" : "type-59",
    "self_type" : "type-58",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3161,7 +3161,7 @@
    "referenced_type" : "type-77",
    "self_type" : "type-76",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3171,7 +3171,7 @@
    "referenced_type" : "type-87",
    "self_type" : "type-86",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3181,7 +3181,7 @@
    "referenced_type" : "type-99",
    "self_type" : "type-98",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3191,7 +3191,7 @@
    "referenced_type" : "type-2",
    "self_type" : "type-131",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "is_const" : true,
@@ -3199,7 +3199,7 @@
    "name" : "const void",
    "referenced_type" : "type-48",
    "self_type" : "type-47",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   }
  ],
  "record_types" :
@@ -3263,7 +3263,7 @@
    "referenced_type" : "type-63",
    "self_type" : "type-63",
    "size" : 64,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "unique_id" : "AndroidLogEntry_t"
   },
   {
@@ -3280,7 +3280,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-5",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_header_t"
   },
   {
@@ -3302,7 +3302,7 @@
    "referenced_type" : "type-158",
    "self_type" : "type-158",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_int_t"
   },
   {
@@ -3324,7 +3324,7 @@
    "referenced_type" : "type-160",
    "self_type" : "type-160",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_long_t"
   },
   {
@@ -3351,7 +3351,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-162",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_string_t"
   },
   {
@@ -3373,7 +3373,7 @@
    "referenced_type" : "type-159",
    "self_type" : "type-159",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_int_t"
   },
   {
@@ -3398,7 +3398,7 @@
    "referenced_type" : "type-148",
    "self_type" : "type-148",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
    "unique_id" : "_ZTS22android_log_event_list"
   },
   {
@@ -3420,7 +3420,7 @@
    "referenced_type" : "type-161",
    "self_type" : "type-161",
    "size" : 13,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_long_t"
   },
   {
@@ -3452,7 +3452,7 @@
    "referenced_type" : "type-4",
    "self_type" : "type-4",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_string_t"
   },
   {
@@ -3479,7 +3479,7 @@
    "referenced_type" : "type-157",
    "self_type" : "type-157",
    "size" : 11,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_header_t"
   },
   {
@@ -3511,7 +3511,7 @@
    "referenced_type" : "type-142",
    "self_type" : "type-142",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
    "unique_id" : "android_log_list_element"
   },
   {
@@ -3536,14 +3536,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3) at system/logging/liblog/include/log/log_event_list.h:53:3",
-   "name" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3) at system/logging/liblog/include/log/log_event_list.h:53:3",
+   "linker_set_key" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3) at system/core/liblog/include/log/log_event_list.h:53:3",
+   "name" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3) at system/core/liblog/include/log/log_event_list.h:53:3",
    "record_kind" : "union",
    "referenced_type" : "type-143",
    "self_type" : "type-143",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
-   "unique_id" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3)"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
+   "unique_id" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3)"
   },
   {
    "alignment" : 1,
@@ -3574,7 +3574,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-156",
    "size" : 7,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_pmsg_log_header_t"
   },
   {
@@ -3590,7 +3590,7 @@
    "referenced_type" : "type-82",
    "self_type" : "type-82",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -3623,14 +3623,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-83",
    "self_type" : "type-83",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -3651,7 +3651,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-17",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -3698,7 +3698,7 @@
    "referenced_type" : "type-34",
    "self_type" : "type-34",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -3750,7 +3750,7 @@
    "referenced_type" : "type-52",
    "self_type" : "type-52",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -3802,7 +3802,7 @@
    "referenced_type" : "type-60",
    "self_type" : "type-60",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -3859,7 +3859,7 @@
    "referenced_type" : "type-78",
    "self_type" : "type-78",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   }
  ],
diff --git a/29/64/arm64_armv8-a/source-based/libmediandk.so.lsdump b/29/64/arm64_armv8-a/source-based/libmediandk.so.lsdump
index 23ddfe8..a93e744 100644
--- a/29/64/arm64_armv8-a/source-based/libmediandk.so.lsdump
+++ b/29/64/arm64_armv8-a/source-based/libmediandk.so.lsdump
@@ -203,7 +203,7 @@
    "name" : "char []",
    "referenced_type" : "type-49",
    "self_type" : "type-2720",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -317,7 +317,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-2793",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -2049,7 +2049,7 @@
    "referenced_type" : "type-2851",
    "self_type" : "type-2851",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "AndroidEventLogType"
   },
@@ -4760,7 +4760,7 @@
    "referenced_type" : "type-2557",
    "self_type" : "type-2557",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "android_LogPriority"
   },
@@ -7242,7 +7242,7 @@
    "referenced_type" : "type-2583",
    "self_type" : "type-2583",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "log_id"
   },
@@ -13472,7 +13472,7 @@
    "referenced_type" : "type-2818",
    "self_type" : "type-2841",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -13481,7 +13481,7 @@
    "referenced_type" : "type-2693",
    "self_type" : "type-2710",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13589,7 +13589,7 @@
    "referenced_type" : "type-1077",
    "self_type" : "type-1079",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13598,7 +13598,7 @@
    "referenced_type" : "type-1366",
    "self_type" : "type-1369",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13607,7 +13607,7 @@
    "referenced_type" : "type-1478",
    "self_type" : "type-1480",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13616,7 +13616,7 @@
    "referenced_type" : "type-1501",
    "self_type" : "type-1504",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13625,7 +13625,7 @@
    "referenced_type" : "type-1646",
    "self_type" : "type-1655",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13634,7 +13634,7 @@
    "referenced_type" : "type-1695",
    "self_type" : "type-1697",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13643,7 +13643,7 @@
    "referenced_type" : "type-1740",
    "self_type" : "type-1742",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13652,7 +13652,7 @@
    "referenced_type" : "type-1788",
    "self_type" : "type-1790",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13661,7 +13661,7 @@
    "referenced_type" : "type-1878",
    "self_type" : "type-1877",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13670,7 +13670,7 @@
    "referenced_type" : "type-2310",
    "self_type" : "type-2309",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13679,7 +13679,7 @@
    "referenced_type" : "type-2659",
    "self_type" : "type-2680",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13688,7 +13688,7 @@
    "referenced_type" : "type-394",
    "self_type" : "type-396",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13697,7 +13697,7 @@
    "referenced_type" : "type-462",
    "self_type" : "type-464",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13706,7 +13706,7 @@
    "referenced_type" : "type-773",
    "self_type" : "type-809",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13715,7 +13715,7 @@
    "referenced_type" : "type-898",
    "self_type" : "type-900",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13724,7 +13724,7 @@
    "referenced_type" : "type-959",
    "self_type" : "type-961",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -20144,7 +20144,7 @@
    "referenced_type" : "type-2818",
    "self_type" : "type-2819",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20153,7 +20153,7 @@
    "referenced_type" : "type-2693",
    "self_type" : "type-2700",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -20639,7 +20639,7 @@
    "referenced_type" : "type-2791",
    "self_type" : "type-2842",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20648,7 +20648,7 @@
    "referenced_type" : "type-2617",
    "self_type" : "type-2669",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -21301,7 +21301,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-2720",
    "self_type" : "type-2731",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -23881,7 +23881,7 @@
    "referenced_type" : "type-2791",
    "self_type" : "type-2818",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -23891,7 +23891,7 @@
    "referenced_type" : "type-2617",
    "self_type" : "type-2693",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25461,7 +25461,7 @@
    "referenced_type" : "type-1078",
    "self_type" : "type-1077",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25471,7 +25471,7 @@
    "referenced_type" : "type-1367",
    "self_type" : "type-1366",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25481,7 +25481,7 @@
    "referenced_type" : "type-1479",
    "self_type" : "type-1478",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25491,7 +25491,7 @@
    "referenced_type" : "type-1502",
    "self_type" : "type-1501",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25501,7 +25501,7 @@
    "referenced_type" : "type-1647",
    "self_type" : "type-1646",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25511,7 +25511,7 @@
    "referenced_type" : "type-1696",
    "self_type" : "type-1695",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25521,7 +25521,7 @@
    "referenced_type" : "type-1741",
    "self_type" : "type-1740",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25531,7 +25531,7 @@
    "referenced_type" : "type-1789",
    "self_type" : "type-1788",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25541,7 +25541,7 @@
    "referenced_type" : "type-1879",
    "self_type" : "type-1878",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25551,7 +25551,7 @@
    "referenced_type" : "type-2311",
    "self_type" : "type-2310",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25561,7 +25561,7 @@
    "referenced_type" : "type-2660",
    "self_type" : "type-2659",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25571,7 +25571,7 @@
    "referenced_type" : "type-395",
    "self_type" : "type-394",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25581,7 +25581,7 @@
    "referenced_type" : "type-463",
    "self_type" : "type-462",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25591,7 +25591,7 @@
    "referenced_type" : "type-774",
    "self_type" : "type-773",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25601,7 +25601,7 @@
    "referenced_type" : "type-899",
    "self_type" : "type-898",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25611,7 +25611,7 @@
    "referenced_type" : "type-960",
    "self_type" : "type-959",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -25631,7 +25631,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-205",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -49257,7 +49257,7 @@
    "referenced_type" : "type-2791",
    "self_type" : "type-2791",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -49290,14 +49290,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2792",
    "self_type" : "type-2792",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -49318,7 +49318,7 @@
    "referenced_type" : "type-2617",
    "self_type" : "type-2617",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -49365,7 +49365,7 @@
    "referenced_type" : "type-2747",
    "self_type" : "type-2747",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -49417,7 +49417,7 @@
    "referenced_type" : "type-2769",
    "self_type" : "type-2769",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -49469,7 +49469,7 @@
    "referenced_type" : "type-2776",
    "self_type" : "type-2776",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -49526,7 +49526,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2788",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/arm64_armv8-a/source-based/libstdc++.so.lsdump b/29/64/arm64_armv8-a/source-based/libstdc++.so.lsdump
index 8e2d5f6..b7b279d 100644
--- a/29/64/arm64_armv8-a/source-based/libstdc++.so.lsdump
+++ b/29/64/arm64_armv8-a/source-based/libstdc++.so.lsdump
@@ -389,7 +389,7 @@
    "referenced_type" : "type-78",
    "self_type" : "type-78",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-20",
    "unique_id" : "android_LogPriority"
   },
@@ -443,7 +443,7 @@
    "referenced_type" : "type-79",
    "self_type" : "type-79",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-20",
    "unique_id" : "log_id"
   },
diff --git a/29/64/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
index ba15e1b..f0a641d 100644
--- a/29/64/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
+++ b/29/64/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
@@ -105,7 +105,7 @@
    "name" : "char []",
    "referenced_type" : "type-143",
    "self_type" : "type-814",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -218,7 +218,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-2770",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1026,7 +1026,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2788",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -2563,7 +2563,7 @@
    "referenced_type" : "type-2746",
    "self_type" : "type-2746",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -5037,7 +5037,7 @@
    "referenced_type" : "type-2747",
    "self_type" : "type-2747",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -15938,7 +15938,7 @@
    "referenced_type" : "type-2784",
    "self_type" : "type-2786",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -15947,7 +15947,7 @@
    "referenced_type" : "type-2753",
    "self_type" : "type-2755",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16127,7 +16127,7 @@
    "referenced_type" : "type-2164",
    "self_type" : "type-2176",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16136,7 +16136,7 @@
    "referenced_type" : "type-2359",
    "self_type" : "type-2358",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16145,7 +16145,7 @@
    "referenced_type" : "type-2394",
    "self_type" : "type-2396",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16154,7 +16154,7 @@
    "referenced_type" : "type-2600",
    "self_type" : "type-2602",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16163,7 +16163,7 @@
    "referenced_type" : "type-2749",
    "self_type" : "type-2752",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16172,7 +16172,7 @@
    "referenced_type" : "type-2764",
    "self_type" : "type-2763",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -18704,7 +18704,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-362",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21215,7 +21215,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-162",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21260,7 +21260,7 @@
    "referenced_type" : "type-2784",
    "self_type" : "type-2785",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21269,7 +21269,7 @@
    "referenced_type" : "type-2753",
    "self_type" : "type-2754",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21521,7 +21521,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2787",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21530,7 +21530,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2751",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25803,7 +25803,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-814",
    "self_type" : "type-2756",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28785,7 +28785,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-163",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28855,7 +28855,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2784",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28865,7 +28865,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2753",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -29075,7 +29075,7 @@
    "referenced_type" : "type-2165",
    "self_type" : "type-2164",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29085,7 +29085,7 @@
    "referenced_type" : "type-2360",
    "self_type" : "type-2359",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29095,7 +29095,7 @@
    "referenced_type" : "type-2395",
    "self_type" : "type-2394",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29105,7 +29105,7 @@
    "referenced_type" : "type-2601",
    "self_type" : "type-2600",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29115,7 +29115,7 @@
    "referenced_type" : "type-2750",
    "self_type" : "type-2749",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29125,7 +29125,7 @@
    "referenced_type" : "type-2765",
    "self_type" : "type-2764",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -61062,7 +61062,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2768",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -61095,14 +61095,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2769",
    "self_type" : "type-2769",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -61123,7 +61123,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2748",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -61170,7 +61170,7 @@
    "referenced_type" : "type-2757",
    "self_type" : "type-2757",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -61222,7 +61222,7 @@
    "referenced_type" : "type-2759",
    "self_type" : "type-2759",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -61274,7 +61274,7 @@
    "referenced_type" : "type-2761",
    "self_type" : "type-2761",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -61331,7 +61331,7 @@
    "referenced_type" : "type-2766",
    "self_type" : "type-2766",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
index a500095..c3d2ba9 100644
--- a/29/64/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
+++ b/29/64/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
@@ -105,7 +105,7 @@
    "name" : "char []",
    "referenced_type" : "type-143",
    "self_type" : "type-814",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -218,7 +218,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-2770",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1062,7 +1062,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2788",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -2599,7 +2599,7 @@
    "referenced_type" : "type-2746",
    "self_type" : "type-2746",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -5073,7 +5073,7 @@
    "referenced_type" : "type-2747",
    "self_type" : "type-2747",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -16046,7 +16046,7 @@
    "referenced_type" : "type-2784",
    "self_type" : "type-2786",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -16055,7 +16055,7 @@
    "referenced_type" : "type-2753",
    "self_type" : "type-2755",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16235,7 +16235,7 @@
    "referenced_type" : "type-2164",
    "self_type" : "type-2176",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16244,7 +16244,7 @@
    "referenced_type" : "type-2359",
    "self_type" : "type-2358",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16253,7 +16253,7 @@
    "referenced_type" : "type-2394",
    "self_type" : "type-2396",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16262,7 +16262,7 @@
    "referenced_type" : "type-2600",
    "self_type" : "type-2602",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16271,7 +16271,7 @@
    "referenced_type" : "type-2749",
    "self_type" : "type-2752",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16280,7 +16280,7 @@
    "referenced_type" : "type-2764",
    "self_type" : "type-2763",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -18812,7 +18812,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-362",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21323,7 +21323,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-162",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21368,7 +21368,7 @@
    "referenced_type" : "type-2784",
    "self_type" : "type-2785",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21377,7 +21377,7 @@
    "referenced_type" : "type-2753",
    "self_type" : "type-2754",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21629,7 +21629,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2787",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21638,7 +21638,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2751",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25911,7 +25911,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-814",
    "self_type" : "type-2756",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28893,7 +28893,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-163",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28963,7 +28963,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2784",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28973,7 +28973,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2753",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -29183,7 +29183,7 @@
    "referenced_type" : "type-2165",
    "self_type" : "type-2164",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29193,7 +29193,7 @@
    "referenced_type" : "type-2360",
    "self_type" : "type-2359",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29203,7 +29203,7 @@
    "referenced_type" : "type-2395",
    "self_type" : "type-2394",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29213,7 +29213,7 @@
    "referenced_type" : "type-2601",
    "self_type" : "type-2600",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29223,7 +29223,7 @@
    "referenced_type" : "type-2750",
    "self_type" : "type-2749",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29233,7 +29233,7 @@
    "referenced_type" : "type-2765",
    "self_type" : "type-2764",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -61170,7 +61170,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2768",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -61203,14 +61203,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2769",
    "self_type" : "type-2769",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -61231,7 +61231,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2748",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -61278,7 +61278,7 @@
    "referenced_type" : "type-2757",
    "self_type" : "type-2757",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -61330,7 +61330,7 @@
    "referenced_type" : "type-2759",
    "self_type" : "type-2759",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -61382,7 +61382,7 @@
    "referenced_type" : "type-2761",
    "self_type" : "type-2761",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -61439,7 +61439,7 @@
    "referenced_type" : "type-2766",
    "self_type" : "type-2766",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/arm_armv7-a-neon/source-based/libRS.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libRS.so.lsdump
index 6157374..ae88b06 100644
--- a/29/64/arm_armv7-a-neon/source-based/libRS.so.lsdump
+++ b/29/64/arm_armv7-a-neon/source-based/libRS.so.lsdump
@@ -389,7 +389,7 @@
    "name" : "char []",
    "referenced_type" : "type-18",
    "self_type" : "type-4053",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 2,
@@ -622,7 +622,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-4066",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1403,7 +1403,7 @@
    "referenced_type" : "type-4071",
    "self_type" : "type-4071",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "AndroidEventLogType"
   },
@@ -4671,7 +4671,7 @@
    "referenced_type" : "type-4032",
    "self_type" : "type-4032",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "android_LogPriority"
   },
@@ -4805,7 +4805,7 @@
    "referenced_type" : "type-4033",
    "self_type" : "type-4033",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "log_id"
   },
@@ -16904,7 +16904,7 @@
    "referenced_type" : "type-4067",
    "self_type" : "type-4069",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -16913,7 +16913,7 @@
    "referenced_type" : "type-4050",
    "self_type" : "type-4052",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -17867,7 +17867,7 @@
    "referenced_type" : "type-4046",
    "self_type" : "type-4049",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -17876,7 +17876,7 @@
    "referenced_type" : "type-6934",
    "self_type" : "type-6935",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "linker_set_key" : "const uniform_int_distribution<_IntType> &",
@@ -20769,7 +20769,7 @@
    "referenced_type" : "type-4067",
    "self_type" : "type-4068",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20778,7 +20778,7 @@
    "referenced_type" : "type-4050",
    "self_type" : "type-4051",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -22947,7 +22947,7 @@
    "referenced_type" : "type-4064",
    "self_type" : "type-4070",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -22956,7 +22956,7 @@
    "referenced_type" : "type-4045",
    "self_type" : "type-4048",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -27650,7 +27650,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-4053",
    "self_type" : "type-4054",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28644,7 +28644,7 @@
    "referenced_type" : "type-4064",
    "self_type" : "type-4067",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28654,7 +28654,7 @@
    "referenced_type" : "type-4045",
    "self_type" : "type-4050",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -30866,7 +30866,7 @@
    "referenced_type" : "type-2487",
    "self_type" : "type-4046",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -30876,7 +30876,7 @@
    "referenced_type" : "type-6928",
    "self_type" : "type-6934",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -42221,7 +42221,7 @@
    "referenced_type" : "type-4064",
    "self_type" : "type-4064",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -42254,14 +42254,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-4065",
    "self_type" : "type-4065",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -42282,7 +42282,7 @@
    "referenced_type" : "type-4045",
    "self_type" : "type-4045",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -42329,7 +42329,7 @@
    "referenced_type" : "type-4055",
    "self_type" : "type-4055",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -42381,7 +42381,7 @@
    "referenced_type" : "type-4057",
    "self_type" : "type-4057",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -42433,7 +42433,7 @@
    "referenced_type" : "type-4060",
    "self_type" : "type-4060",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -42490,7 +42490,7 @@
    "referenced_type" : "type-4062",
    "self_type" : "type-4062",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/arm_armv7-a-neon/source-based/liblog.so.lsdump b/29/64/arm_armv7-a-neon/source-based/liblog.so.lsdump
index d6bdca5..d5d7aad 100644
--- a/29/64/arm_armv7-a-neon/source-based/liblog.so.lsdump
+++ b/29/64/arm_armv7-a-neon/source-based/liblog.so.lsdump
@@ -6,7 +6,7 @@
    "name" : "char []",
    "referenced_type" : "type-9",
    "self_type" : "type-8",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -15,7 +15,7 @@
    "referenced_type" : "type-86",
    "self_type" : "type-85",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   }
  ],
  "builtin_types" :
@@ -378,7 +378,7 @@
    "referenced_type" : "type-126",
    "self_type" : "type-126",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -468,7 +468,7 @@
    "referenced_type" : "type-64",
    "self_type" : "type-64",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidLogPrintFormat"
   },
@@ -518,7 +518,7 @@
    "referenced_type" : "type-1",
    "self_type" : "type-1",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -572,7 +572,7 @@
    "referenced_type" : "type-104",
    "self_type" : "type-104",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -626,7 +626,7 @@
    "referenced_type" : "type-32",
    "self_type" : "type-32",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_id.h",
+   "source_file" : "/system/core/liblog/include/log/log_id.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   }
@@ -661,7 +661,7 @@
    "referenced_type" : "type-133",
    "return_type" : "type-6",
    "self_type" : "type-133",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "functions" :
@@ -682,7 +682,7 @@
     }
    ],
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bswrite",
@@ -697,7 +697,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_btwrite",
@@ -718,7 +718,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_buf_print",
@@ -739,7 +739,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_buf_write",
@@ -760,7 +760,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bwrite",
@@ -778,13 +778,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_close",
    "linker_set_key" : "__android_log_close",
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_error_write",
@@ -808,13 +808,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_safetynet.h"
+   "source_file" : "/system/core/liblog/include/log/log_safetynet.h"
   },
   {
    "function_name" : "__android_log_is_debuggable",
    "linker_set_key" : "__android_log_is_debuggable",
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_properties.h"
+   "source_file" : "/system/core/liblog/include/log/log_properties.h"
   },
   {
    "function_name" : "__android_log_is_loggable",
@@ -832,7 +832,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_main.h"
+   "source_file" : "/system/core/liblog/include/log/log_main.h"
   },
   {
    "function_name" : "__android_log_is_loggable_len",
@@ -853,7 +853,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_main.h"
+   "source_file" : "/system/core/liblog/include/log/log_main.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_read",
@@ -877,7 +877,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_write",
@@ -901,7 +901,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_print",
@@ -919,13 +919,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_security",
    "linker_set_key" : "__android_log_security",
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_security_bswrite",
@@ -940,7 +940,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_vprint",
@@ -961,7 +961,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write",
@@ -979,7 +979,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_logger_get_buffer_size",
@@ -991,7 +991,7 @@
     }
    ],
    "return_type" : "type-40",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_logger_property_get_bool",
@@ -1006,7 +1006,7 @@
     }
    ],
    "return_type" : "type-3",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_destroy",
@@ -1018,7 +1018,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_id_to_name",
@@ -1030,7 +1030,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_log_parser_reset",
@@ -1048,7 +1048,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_processBinaryLogBuffer",
@@ -1072,7 +1072,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_processLogBuffer",
@@ -1087,7 +1087,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_read_next",
@@ -1099,7 +1099,7 @@
     }
    ],
    "return_type" : "type-143",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_reset",
@@ -1111,7 +1111,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_float32",
@@ -1126,7 +1126,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int32",
@@ -1141,7 +1141,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int64",
@@ -1156,7 +1156,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list",
@@ -1171,7 +1171,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_begin",
@@ -1183,7 +1183,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_buffer",
@@ -1198,7 +1198,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_write_list_end",
@@ -1210,7 +1210,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8",
@@ -1225,7 +1225,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8_len",
@@ -1243,7 +1243,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_logger_clear",
@@ -1255,7 +1255,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_id",
@@ -1267,7 +1267,7 @@
     }
    ],
    "return_type" : "type-32",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_readable_size",
@@ -1279,7 +1279,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_size",
@@ -1291,7 +1291,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_version",
@@ -1303,7 +1303,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_prune_list",
@@ -1321,7 +1321,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_statistics",
@@ -1339,7 +1339,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc",
@@ -1357,7 +1357,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc_time",
@@ -1375,7 +1375,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_free",
@@ -1387,7 +1387,7 @@
     }
    ],
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_open",
@@ -1408,7 +1408,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_read",
@@ -1423,7 +1423,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_open",
@@ -1438,7 +1438,7 @@
     }
    ],
    "return_type" : "type-37",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_log_size",
@@ -1453,7 +1453,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_prune_list",
@@ -1471,7 +1471,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_lookupEventTagNum",
@@ -1492,7 +1492,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "android_name_to_log_id",
@@ -1504,7 +1504,7 @@
     }
    ],
    "return_type" : "type-104",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_openEventTagMap",
@@ -1516,7 +1516,7 @@
     }
    ],
    "return_type" : "type-81",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "create_android_log_parser",
@@ -1531,7 +1531,7 @@
     }
    ],
    "return_type" : "type-147",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "create_android_logger",
@@ -1543,7 +1543,7 @@
     }
    ],
    "return_type" : "type-147",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "global_vars" : [],
@@ -1556,7 +1556,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-154",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1565,7 +1565,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-115",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1574,7 +1574,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-27",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1583,7 +1583,7 @@
    "referenced_type" : "type-108",
    "self_type" : "type-110",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1592,7 +1592,7 @@
    "referenced_type" : "type-119",
    "self_type" : "type-121",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1601,7 +1601,7 @@
    "referenced_type" : "type-129",
    "self_type" : "type-132",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1610,7 +1610,7 @@
    "referenced_type" : "type-155",
    "self_type" : "type-157",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1619,7 +1619,7 @@
    "referenced_type" : "type-173",
    "self_type" : "type-175",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1628,7 +1628,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-22",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1637,7 +1637,7 @@
    "referenced_type" : "type-205",
    "self_type" : "type-207",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1646,7 +1646,7 @@
    "referenced_type" : "type-213",
    "self_type" : "type-215",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1655,7 +1655,7 @@
    "referenced_type" : "type-245",
    "self_type" : "type-247",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1664,7 +1664,7 @@
    "referenced_type" : "type-276",
    "self_type" : "type-278",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1673,7 +1673,7 @@
    "referenced_type" : "type-287",
    "self_type" : "type-289",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1682,7 +1682,7 @@
    "referenced_type" : "type-295",
    "self_type" : "type-297",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1691,7 +1691,7 @@
    "referenced_type" : "type-303",
    "self_type" : "type-305",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1700,7 +1700,7 @@
    "referenced_type" : "type-313",
    "self_type" : "type-315",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1709,7 +1709,7 @@
    "referenced_type" : "type-321",
    "self_type" : "type-323",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1718,7 +1718,7 @@
    "referenced_type" : "type-332",
    "self_type" : "type-334",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1727,7 +1727,7 @@
    "referenced_type" : "type-345",
    "self_type" : "type-347",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1736,7 +1736,7 @@
    "referenced_type" : "type-355",
    "self_type" : "type-357",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1745,7 +1745,7 @@
    "referenced_type" : "type-382",
    "self_type" : "type-384",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1754,7 +1754,7 @@
    "referenced_type" : "type-409",
    "self_type" : "type-411",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1763,7 +1763,7 @@
    "referenced_type" : "type-424",
    "self_type" : "type-426",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1772,7 +1772,7 @@
    "referenced_type" : "type-435",
    "self_type" : "type-437",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1781,7 +1781,7 @@
    "referenced_type" : "type-444",
    "self_type" : "type-447",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1790,7 +1790,7 @@
    "referenced_type" : "type-456",
    "self_type" : "type-461",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1799,7 +1799,7 @@
    "referenced_type" : "type-467",
    "self_type" : "type-469",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1808,7 +1808,7 @@
    "referenced_type" : "type-475",
    "self_type" : "type-477",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1817,7 +1817,7 @@
    "referenced_type" : "type-488",
    "self_type" : "type-490",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1826,7 +1826,7 @@
    "referenced_type" : "type-56",
    "self_type" : "type-58",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1835,7 +1835,7 @@
    "referenced_type" : "type-92",
    "self_type" : "type-94",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1844,7 +1844,7 @@
    "referenced_type" : "type-102",
    "self_type" : "type-101",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1853,7 +1853,7 @@
    "referenced_type" : "type-111",
    "self_type" : "type-114",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1862,7 +1862,7 @@
    "referenced_type" : "type-123",
    "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1871,7 +1871,7 @@
    "referenced_type" : "type-138",
    "self_type" : "type-137",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1880,7 +1880,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1889,7 +1889,7 @@
    "referenced_type" : "type-141",
    "self_type" : "type-140",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1898,7 +1898,7 @@
    "referenced_type" : "type-168",
    "self_type" : "type-167",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1907,7 +1907,7 @@
    "referenced_type" : "type-178",
    "self_type" : "type-177",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1916,7 +1916,7 @@
    "referenced_type" : "type-181",
    "self_type" : "type-183",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1925,7 +1925,7 @@
    "referenced_type" : "type-190",
    "self_type" : "type-192",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1934,7 +1934,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-193",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1943,7 +1943,7 @@
    "referenced_type" : "type-197",
    "self_type" : "type-196",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1952,7 +1952,7 @@
    "referenced_type" : "type-200",
    "self_type" : "type-199",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1961,7 +1961,7 @@
    "referenced_type" : "type-209",
    "self_type" : "type-208",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1970,7 +1970,7 @@
    "referenced_type" : "type-217",
    "self_type" : "type-216",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1979,7 +1979,7 @@
    "referenced_type" : "type-221",
    "self_type" : "type-220",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1988,7 +1988,7 @@
    "referenced_type" : "type-223",
    "self_type" : "type-225",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1997,7 +1997,7 @@
    "referenced_type" : "type-232",
    "self_type" : "type-235",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2006,7 +2006,7 @@
    "referenced_type" : "type-236",
    "self_type" : "type-238",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2015,7 +2015,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-248",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2024,7 +2024,7 @@
    "referenced_type" : "type-25",
    "self_type" : "type-24",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2033,7 +2033,7 @@
    "referenced_type" : "type-264",
    "self_type" : "type-263",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2042,7 +2042,7 @@
    "referenced_type" : "type-267",
    "self_type" : "type-266",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2051,7 +2051,7 @@
    "referenced_type" : "type-271",
    "self_type" : "type-273",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2060,7 +2060,7 @@
    "referenced_type" : "type-28",
    "self_type" : "type-31",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2069,7 +2069,7 @@
    "referenced_type" : "type-283",
    "self_type" : "type-282",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2078,7 +2078,7 @@
    "referenced_type" : "type-290",
    "self_type" : "type-292",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2087,7 +2087,7 @@
    "referenced_type" : "type-299",
    "self_type" : "type-298",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2096,7 +2096,7 @@
    "referenced_type" : "type-309",
    "self_type" : "type-308",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2105,7 +2105,7 @@
    "referenced_type" : "type-317",
    "self_type" : "type-316",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2114,7 +2114,7 @@
    "referenced_type" : "type-325",
    "self_type" : "type-324",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2123,7 +2123,7 @@
    "referenced_type" : "type-328",
    "self_type" : "type-327",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2132,7 +2132,7 @@
    "referenced_type" : "type-350",
    "self_type" : "type-349",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2141,7 +2141,7 @@
    "referenced_type" : "type-360",
    "self_type" : "type-359",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2150,7 +2150,7 @@
    "referenced_type" : "type-363",
    "self_type" : "type-365",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2159,7 +2159,7 @@
    "referenced_type" : "type-372",
    "self_type" : "type-374",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2168,7 +2168,7 @@
    "referenced_type" : "type-375",
    "self_type" : "type-377",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2177,7 +2177,7 @@
    "referenced_type" : "type-386",
    "self_type" : "type-385",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2186,7 +2186,7 @@
    "referenced_type" : "type-399",
    "self_type" : "type-398",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2195,7 +2195,7 @@
    "referenced_type" : "type-403",
    "self_type" : "type-405",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2204,7 +2204,7 @@
    "referenced_type" : "type-415",
    "self_type" : "type-414",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2213,7 +2213,7 @@
    "referenced_type" : "type-419",
    "self_type" : "type-418",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2222,7 +2222,7 @@
    "referenced_type" : "type-427",
    "self_type" : "type-430",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2231,7 +2231,7 @@
    "referenced_type" : "type-43",
    "self_type" : "type-45",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2240,7 +2240,7 @@
    "referenced_type" : "type-439",
    "self_type" : "type-438",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2249,7 +2249,7 @@
    "referenced_type" : "type-451",
    "self_type" : "type-450",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2258,7 +2258,7 @@
    "referenced_type" : "type-459",
    "self_type" : "type-458",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2267,7 +2267,7 @@
    "referenced_type" : "type-46",
    "self_type" : "type-48",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2276,7 +2276,7 @@
    "referenced_type" : "type-463",
    "self_type" : "type-462",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2285,7 +2285,7 @@
    "referenced_type" : "type-471",
    "self_type" : "type-470",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2294,7 +2294,7 @@
    "referenced_type" : "type-479",
    "self_type" : "type-478",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2303,7 +2303,7 @@
    "referenced_type" : "type-60",
    "self_type" : "type-59",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2312,7 +2312,7 @@
    "referenced_type" : "type-79",
    "self_type" : "type-78",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2321,7 +2321,7 @@
    "referenced_type" : "type-87",
    "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2330,7 +2330,7 @@
    "referenced_type" : "type-98",
    "self_type" : "type-97",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   }
  ],
  "pointer_types" :
@@ -2342,7 +2342,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-69",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2351,7 +2351,7 @@
    "referenced_type" : "type-253",
    "self_type" : "type-252",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2360,7 +2360,7 @@
    "referenced_type" : "type-389",
    "self_type" : "type-388",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2369,7 +2369,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-66",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2378,7 +2378,7 @@
    "referenced_type" : "type-270",
    "self_type" : "type-269",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2387,7 +2387,7 @@
    "referenced_type" : "type-402",
    "self_type" : "type-401",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2396,7 +2396,7 @@
    "referenced_type" : "type-82",
    "self_type" : "type-81",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2405,7 +2405,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-105",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2414,7 +2414,7 @@
    "referenced_type" : "type-117",
    "self_type" : "type-116",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2423,7 +2423,7 @@
    "referenced_type" : "type-128",
    "self_type" : "type-127",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2432,7 +2432,7 @@
    "referenced_type" : "type-148",
    "self_type" : "type-147",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2441,7 +2441,7 @@
    "referenced_type" : "type-172",
    "self_type" : "type-171",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2450,7 +2450,7 @@
    "referenced_type" : "type-19",
    "self_type" : "type-18",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2459,7 +2459,7 @@
    "referenced_type" : "type-203",
    "self_type" : "type-202",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2468,7 +2468,7 @@
    "referenced_type" : "type-212",
    "self_type" : "type-211",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2477,7 +2477,7 @@
    "referenced_type" : "type-244",
    "self_type" : "type-243",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2486,7 +2486,7 @@
    "referenced_type" : "type-275",
    "self_type" : "type-274",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2495,7 +2495,7 @@
    "referenced_type" : "type-286",
    "self_type" : "type-285",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2504,7 +2504,7 @@
    "referenced_type" : "type-294",
    "self_type" : "type-293",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2513,7 +2513,7 @@
    "referenced_type" : "type-302",
    "self_type" : "type-301",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2522,7 +2522,7 @@
    "referenced_type" : "type-312",
    "self_type" : "type-311",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2531,7 +2531,7 @@
    "referenced_type" : "type-320",
    "self_type" : "type-319",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2540,7 +2540,7 @@
    "referenced_type" : "type-331",
    "self_type" : "type-330",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2549,7 +2549,7 @@
    "referenced_type" : "type-339",
    "self_type" : "type-338",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2558,7 +2558,7 @@
    "referenced_type" : "type-354",
    "self_type" : "type-353",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2567,7 +2567,7 @@
    "referenced_type" : "type-381",
    "self_type" : "type-380",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2576,7 +2576,7 @@
    "referenced_type" : "type-408",
    "self_type" : "type-407",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2585,7 +2585,7 @@
    "referenced_type" : "type-422",
    "self_type" : "type-421",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2594,7 +2594,7 @@
    "referenced_type" : "type-433",
    "self_type" : "type-432",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2603,7 +2603,7 @@
    "referenced_type" : "type-443",
    "self_type" : "type-442",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2612,7 +2612,7 @@
    "referenced_type" : "type-455",
    "self_type" : "type-454",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2621,7 +2621,7 @@
    "referenced_type" : "type-466",
    "self_type" : "type-465",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2630,7 +2630,7 @@
    "referenced_type" : "type-474",
    "self_type" : "type-473",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2639,7 +2639,7 @@
    "referenced_type" : "type-482",
    "self_type" : "type-481",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2648,7 +2648,7 @@
    "referenced_type" : "type-55",
    "self_type" : "type-54",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2657,7 +2657,7 @@
    "referenced_type" : "type-91",
    "self_type" : "type-90",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2666,7 +2666,7 @@
    "referenced_type" : "type-147",
    "self_type" : "type-149",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2675,7 +2675,7 @@
    "referenced_type" : "type-202",
    "self_type" : "type-204",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2684,7 +2684,7 @@
    "referenced_type" : "type-338",
    "self_type" : "type-340",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2693,7 +2693,7 @@
    "referenced_type" : "type-481",
    "self_type" : "type-483",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2702,7 +2702,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-151",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2711,7 +2711,7 @@
    "referenced_type" : "type-9",
    "self_type" : "type-125",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2720,7 +2720,7 @@
    "referenced_type" : "type-73",
    "self_type" : "type-74",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2729,7 +2729,7 @@
    "referenced_type" : "type-256",
    "self_type" : "type-258",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2738,7 +2738,7 @@
    "referenced_type" : "type-279",
    "self_type" : "type-281",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2747,7 +2747,7 @@
    "referenced_type" : "type-392",
    "self_type" : "type-394",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2756,7 +2756,7 @@
    "referenced_type" : "type-412",
    "self_type" : "type-417",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2765,7 +2765,7 @@
    "referenced_type" : "type-70",
    "self_type" : "type-72",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2774,7 +2774,7 @@
    "referenced_type" : "type-95",
    "self_type" : "type-100",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2783,7 +2783,7 @@
    "referenced_type" : "type-152",
    "self_type" : "type-153",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2792,7 +2792,7 @@
    "referenced_type" : "type-12",
    "self_type" : "type-11",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2801,7 +2801,7 @@
    "referenced_type" : "type-11",
    "self_type" : "type-10",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2810,7 +2810,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-113",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2819,7 +2819,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-23",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2828,7 +2828,7 @@
    "referenced_type" : "type-49",
    "self_type" : "type-51",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "alignment" : 4,
@@ -2837,7 +2837,7 @@
    "referenced_type" : "type-133",
    "self_type" : "type-135",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2846,7 +2846,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-118",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2855,7 +2855,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-136",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2864,7 +2864,7 @@
    "referenced_type" : "type-187",
    "self_type" : "type-186",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2873,7 +2873,7 @@
    "referenced_type" : "type-229",
    "self_type" : "type-228",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2882,7 +2882,7 @@
    "referenced_type" : "type-369",
    "self_type" : "type-368",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2891,7 +2891,7 @@
    "referenced_type" : "type-38",
    "self_type" : "type-37",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2900,7 +2900,7 @@
    "referenced_type" : "type-34",
    "self_type" : "type-68",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2909,7 +2909,7 @@
    "referenced_type" : "type-189",
    "self_type" : "type-188",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2918,7 +2918,7 @@
    "referenced_type" : "type-231",
    "self_type" : "type-230",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2927,7 +2927,7 @@
    "referenced_type" : "type-371",
    "self_type" : "type-370",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2936,7 +2936,7 @@
    "referenced_type" : "type-42",
    "self_type" : "type-41",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2945,7 +2945,7 @@
    "referenced_type" : "type-2",
    "self_type" : "type-75",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2954,7 +2954,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-134",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "qualified_types" :
@@ -2965,7 +2965,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-8",
    "self_type" : "type-33",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2975,7 +2975,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-73",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "is_const" : true,
@@ -2983,7 +2983,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-257",
    "self_type" : "type-256",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2993,7 +2993,7 @@
    "referenced_type" : "type-280",
    "self_type" : "type-279",
    "size" : 116,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "is_const" : true,
@@ -3001,7 +3001,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-393",
    "self_type" : "type-392",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -3011,7 +3011,7 @@
    "referenced_type" : "type-413",
    "self_type" : "type-412",
    "size" : 116,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "is_const" : true,
@@ -3019,7 +3019,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-71",
    "self_type" : "type-70",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -3029,7 +3029,7 @@
    "referenced_type" : "type-96",
    "self_type" : "type-95",
    "size" : 116,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -3039,7 +3039,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-152",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -3049,7 +3049,7 @@
    "referenced_type" : "type-9",
    "self_type" : "type-12",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3059,7 +3059,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-107",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -3069,7 +3069,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-16",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3079,7 +3079,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-108",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3089,7 +3089,7 @@
    "referenced_type" : "type-120",
    "self_type" : "type-119",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3099,7 +3099,7 @@
    "referenced_type" : "type-130",
    "self_type" : "type-129",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3109,7 +3109,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-155",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3119,7 +3119,7 @@
    "referenced_type" : "type-174",
    "self_type" : "type-173",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3129,7 +3129,7 @@
    "referenced_type" : "type-206",
    "self_type" : "type-205",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3139,7 +3139,7 @@
    "referenced_type" : "type-214",
    "self_type" : "type-213",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3149,7 +3149,7 @@
    "referenced_type" : "type-21",
    "self_type" : "type-20",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3159,7 +3159,7 @@
    "referenced_type" : "type-246",
    "self_type" : "type-245",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3169,7 +3169,7 @@
    "referenced_type" : "type-277",
    "self_type" : "type-276",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3179,7 +3179,7 @@
    "referenced_type" : "type-288",
    "self_type" : "type-287",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3189,7 +3189,7 @@
    "referenced_type" : "type-296",
    "self_type" : "type-295",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3199,7 +3199,7 @@
    "referenced_type" : "type-304",
    "self_type" : "type-303",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3209,7 +3209,7 @@
    "referenced_type" : "type-314",
    "self_type" : "type-313",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3219,7 +3219,7 @@
    "referenced_type" : "type-322",
    "self_type" : "type-321",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3229,7 +3229,7 @@
    "referenced_type" : "type-333",
    "self_type" : "type-332",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3239,7 +3239,7 @@
    "referenced_type" : "type-346",
    "self_type" : "type-345",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3249,7 +3249,7 @@
    "referenced_type" : "type-356",
    "self_type" : "type-355",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3259,7 +3259,7 @@
    "referenced_type" : "type-383",
    "self_type" : "type-382",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3269,7 +3269,7 @@
    "referenced_type" : "type-410",
    "self_type" : "type-409",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3279,7 +3279,7 @@
    "referenced_type" : "type-425",
    "self_type" : "type-424",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3289,7 +3289,7 @@
    "referenced_type" : "type-436",
    "self_type" : "type-435",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3299,7 +3299,7 @@
    "referenced_type" : "type-445",
    "self_type" : "type-444",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3309,7 +3309,7 @@
    "referenced_type" : "type-457",
    "self_type" : "type-456",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3319,7 +3319,7 @@
    "referenced_type" : "type-468",
    "self_type" : "type-467",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3329,7 +3329,7 @@
    "referenced_type" : "type-476",
    "self_type" : "type-475",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3339,7 +3339,7 @@
    "referenced_type" : "type-489",
    "self_type" : "type-488",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3349,7 +3349,7 @@
    "referenced_type" : "type-57",
    "self_type" : "type-56",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3359,7 +3359,7 @@
    "referenced_type" : "type-93",
    "self_type" : "type-92",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3369,7 +3369,7 @@
    "referenced_type" : "type-103",
    "self_type" : "type-102",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3379,7 +3379,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-111",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3389,7 +3389,7 @@
    "referenced_type" : "type-124",
    "self_type" : "type-123",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3399,7 +3399,7 @@
    "referenced_type" : "type-139",
    "self_type" : "type-138",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3409,7 +3409,7 @@
    "referenced_type" : "type-142",
    "self_type" : "type-141",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3419,7 +3419,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-14",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3429,7 +3429,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-168",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3439,7 +3439,7 @@
    "referenced_type" : "type-179",
    "self_type" : "type-178",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3449,7 +3449,7 @@
    "referenced_type" : "type-182",
    "self_type" : "type-181",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3459,7 +3459,7 @@
    "referenced_type" : "type-191",
    "self_type" : "type-190",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3469,7 +3469,7 @@
    "referenced_type" : "type-195",
    "self_type" : "type-194",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3479,7 +3479,7 @@
    "referenced_type" : "type-198",
    "self_type" : "type-197",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3489,7 +3489,7 @@
    "referenced_type" : "type-201",
    "self_type" : "type-200",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3499,7 +3499,7 @@
    "referenced_type" : "type-210",
    "self_type" : "type-209",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3509,7 +3509,7 @@
    "referenced_type" : "type-218",
    "self_type" : "type-217",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3519,7 +3519,7 @@
    "referenced_type" : "type-222",
    "self_type" : "type-221",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3529,7 +3529,7 @@
    "referenced_type" : "type-224",
    "self_type" : "type-223",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3539,7 +3539,7 @@
    "referenced_type" : "type-233",
    "self_type" : "type-232",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3549,7 +3549,7 @@
    "referenced_type" : "type-237",
    "self_type" : "type-236",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3559,7 +3559,7 @@
    "referenced_type" : "type-250",
    "self_type" : "type-249",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3569,7 +3569,7 @@
    "referenced_type" : "type-265",
    "self_type" : "type-264",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3579,7 +3579,7 @@
    "referenced_type" : "type-268",
    "self_type" : "type-267",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3589,7 +3589,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3599,7 +3599,7 @@
    "referenced_type" : "type-272",
    "self_type" : "type-271",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3609,7 +3609,7 @@
    "referenced_type" : "type-284",
    "self_type" : "type-283",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3619,7 +3619,7 @@
    "referenced_type" : "type-291",
    "self_type" : "type-290",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3629,7 +3629,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-28",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3639,7 +3639,7 @@
    "referenced_type" : "type-300",
    "self_type" : "type-299",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3649,7 +3649,7 @@
    "referenced_type" : "type-310",
    "self_type" : "type-309",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3659,7 +3659,7 @@
    "referenced_type" : "type-318",
    "self_type" : "type-317",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3669,7 +3669,7 @@
    "referenced_type" : "type-326",
    "self_type" : "type-325",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3679,7 +3679,7 @@
    "referenced_type" : "type-329",
    "self_type" : "type-328",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3689,7 +3689,7 @@
    "referenced_type" : "type-351",
    "self_type" : "type-350",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3699,7 +3699,7 @@
    "referenced_type" : "type-361",
    "self_type" : "type-360",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3709,7 +3709,7 @@
    "referenced_type" : "type-364",
    "self_type" : "type-363",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3719,7 +3719,7 @@
    "referenced_type" : "type-373",
    "self_type" : "type-372",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3729,7 +3729,7 @@
    "referenced_type" : "type-376",
    "self_type" : "type-375",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3739,7 +3739,7 @@
    "referenced_type" : "type-387",
    "self_type" : "type-386",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3749,7 +3749,7 @@
    "referenced_type" : "type-400",
    "self_type" : "type-399",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3759,7 +3759,7 @@
    "referenced_type" : "type-404",
    "self_type" : "type-403",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3769,7 +3769,7 @@
    "referenced_type" : "type-416",
    "self_type" : "type-415",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3779,7 +3779,7 @@
    "referenced_type" : "type-420",
    "self_type" : "type-419",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3789,7 +3789,7 @@
    "referenced_type" : "type-428",
    "self_type" : "type-427",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3799,7 +3799,7 @@
    "referenced_type" : "type-440",
    "self_type" : "type-439",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3809,7 +3809,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-43",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3819,7 +3819,7 @@
    "referenced_type" : "type-452",
    "self_type" : "type-451",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3829,7 +3829,7 @@
    "referenced_type" : "type-460",
    "self_type" : "type-459",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3839,7 +3839,7 @@
    "referenced_type" : "type-464",
    "self_type" : "type-463",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3849,7 +3849,7 @@
    "referenced_type" : "type-472",
    "self_type" : "type-471",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3859,7 +3859,7 @@
    "referenced_type" : "type-47",
    "self_type" : "type-46",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3869,7 +3869,7 @@
    "referenced_type" : "type-480",
    "self_type" : "type-479",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3879,7 +3879,7 @@
    "referenced_type" : "type-61",
    "self_type" : "type-60",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3889,7 +3889,7 @@
    "referenced_type" : "type-80",
    "self_type" : "type-79",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3899,7 +3899,7 @@
    "referenced_type" : "type-88",
    "self_type" : "type-87",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3909,7 +3909,7 @@
    "referenced_type" : "type-99",
    "self_type" : "type-98",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3919,7 +3919,7 @@
    "referenced_type" : "type-2",
    "self_type" : "type-131",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "is_const" : true,
@@ -3927,7 +3927,7 @@
    "name" : "const void",
    "referenced_type" : "type-50",
    "self_type" : "type-49",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   }
  ],
  "record_types" :
@@ -3991,7 +3991,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-65",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "unique_id" : "AndroidLogEntry_t"
   },
   {
@@ -4008,7 +4008,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-5",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_header_t"
   },
   {
@@ -4030,7 +4030,7 @@
    "referenced_type" : "type-160",
    "self_type" : "type-160",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_int_t"
   },
   {
@@ -4052,7 +4052,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-162",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_long_t"
   },
   {
@@ -4079,7 +4079,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-164",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_string_t"
   },
   {
@@ -4101,7 +4101,7 @@
    "referenced_type" : "type-161",
    "self_type" : "type-161",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_int_t"
   },
   {
@@ -4126,7 +4126,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-150",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
    "unique_id" : "_ZTS22android_log_event_list"
   },
   {
@@ -4148,7 +4148,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-163",
    "size" : 13,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_long_t"
   },
   {
@@ -4180,7 +4180,7 @@
    "referenced_type" : "type-4",
    "self_type" : "type-4",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_string_t"
   },
   {
@@ -4207,7 +4207,7 @@
    "referenced_type" : "type-159",
    "self_type" : "type-159",
    "size" : 11,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_header_t"
   },
   {
@@ -4239,7 +4239,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-143",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
    "unique_id" : "android_log_list_element"
   },
   {
@@ -4264,14 +4264,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3) at system/logging/liblog/include/log/log_event_list.h:53:3",
-   "name" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3) at system/logging/liblog/include/log/log_event_list.h:53:3",
+   "linker_set_key" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3) at system/core/liblog/include/log/log_event_list.h:53:3",
+   "name" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3) at system/core/liblog/include/log/log_event_list.h:53:3",
    "record_kind" : "union",
    "referenced_type" : "type-144",
    "self_type" : "type-144",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
-   "unique_id" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3)"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
+   "unique_id" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3)"
   },
   {
    "alignment" : 1,
@@ -4302,7 +4302,7 @@
    "referenced_type" : "type-158",
    "self_type" : "type-158",
    "size" : 7,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_pmsg_log_header_t"
   },
   {
@@ -4318,7 +4318,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-83",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -4351,14 +4351,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-84",
    "self_type" : "type-84",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -4379,7 +4379,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-17",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -4426,7 +4426,7 @@
    "referenced_type" : "type-34",
    "self_type" : "type-34",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -4478,7 +4478,7 @@
    "referenced_type" : "type-52",
    "self_type" : "type-52",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -4530,7 +4530,7 @@
    "referenced_type" : "type-62",
    "self_type" : "type-62",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -4587,7 +4587,7 @@
    "referenced_type" : "type-76",
    "self_type" : "type-76",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   }
  ],
diff --git a/29/64/arm_armv7-a-neon/source-based/libmediandk.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
index d69d0e0..138814b 100644
--- a/29/64/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
+++ b/29/64/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
@@ -203,7 +203,7 @@
    "name" : "char []",
    "referenced_type" : "type-42",
    "self_type" : "type-2245",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -308,7 +308,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-2316",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -2045,7 +2045,7 @@
    "referenced_type" : "type-2377",
    "self_type" : "type-2377",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "AndroidEventLogType"
   },
@@ -4756,7 +4756,7 @@
    "referenced_type" : "type-2131",
    "self_type" : "type-2131",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "android_LogPriority"
   },
@@ -7238,7 +7238,7 @@
    "referenced_type" : "type-2143",
    "self_type" : "type-2143",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "log_id"
   },
@@ -13607,7 +13607,7 @@
    "referenced_type" : "type-2333",
    "self_type" : "type-2357",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -13616,7 +13616,7 @@
    "referenced_type" : "type-2215",
    "self_type" : "type-2234",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13769,7 +13769,7 @@
    "referenced_type" : "type-1065",
    "self_type" : "type-1067",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13778,7 +13778,7 @@
    "referenced_type" : "type-1211",
    "self_type" : "type-1210",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13787,7 +13787,7 @@
    "referenced_type" : "type-1628",
    "self_type" : "type-1627",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13796,7 +13796,7 @@
    "referenced_type" : "type-2181",
    "self_type" : "type-2206",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13805,7 +13805,7 @@
    "referenced_type" : "type-2752",
    "self_type" : "type-2754",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13814,7 +13814,7 @@
    "referenced_type" : "type-2779",
    "self_type" : "type-2781",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13823,7 +13823,7 @@
    "referenced_type" : "type-2971",
    "self_type" : "type-2977",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13832,7 +13832,7 @@
    "referenced_type" : "type-3029",
    "self_type" : "type-3033",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13841,7 +13841,7 @@
    "referenced_type" : "type-3076",
    "self_type" : "type-3078",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13850,7 +13850,7 @@
    "referenced_type" : "type-3146",
    "self_type" : "type-3148",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13859,7 +13859,7 @@
    "referenced_type" : "type-3374",
    "self_type" : "type-3376",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13868,7 +13868,7 @@
    "referenced_type" : "type-3475",
    "self_type" : "type-3477",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13877,7 +13877,7 @@
    "referenced_type" : "type-3494",
    "self_type" : "type-3496",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13886,7 +13886,7 @@
    "referenced_type" : "type-3630",
    "self_type" : "type-3636",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13895,7 +13895,7 @@
    "referenced_type" : "type-3665",
    "self_type" : "type-3669",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13904,7 +13904,7 @@
    "referenced_type" : "type-3712",
    "self_type" : "type-3714",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13913,7 +13913,7 @@
    "referenced_type" : "type-3760",
    "self_type" : "type-3764",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13922,7 +13922,7 @@
    "referenced_type" : "type-3852",
    "self_type" : "type-3851",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13931,7 +13931,7 @@
    "referenced_type" : "type-387",
    "self_type" : "type-389",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13940,7 +13940,7 @@
    "referenced_type" : "type-4127",
    "self_type" : "type-4126",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13949,7 +13949,7 @@
    "referenced_type" : "type-4412",
    "self_type" : "type-4420",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13958,7 +13958,7 @@
    "referenced_type" : "type-455",
    "self_type" : "type-457",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13967,7 +13967,7 @@
    "referenced_type" : "type-793",
    "self_type" : "type-799",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13976,7 +13976,7 @@
    "referenced_type" : "type-886",
    "self_type" : "type-890",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13985,7 +13985,7 @@
    "referenced_type" : "type-949",
    "self_type" : "type-951",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -22115,7 +22115,7 @@
    "referenced_type" : "type-2333",
    "self_type" : "type-2356",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -22124,7 +22124,7 @@
    "referenced_type" : "type-2215",
    "self_type" : "type-2224",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -22628,7 +22628,7 @@
    "referenced_type" : "type-2314",
    "self_type" : "type-2367",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -22637,7 +22637,7 @@
    "referenced_type" : "type-2156",
    "self_type" : "type-2195",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -23372,7 +23372,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-2245",
    "self_type" : "type-2261",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -26312,7 +26312,7 @@
    "referenced_type" : "type-2314",
    "self_type" : "type-2333",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -26322,7 +26322,7 @@
    "referenced_type" : "type-2156",
    "self_type" : "type-2215",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28902,7 +28902,7 @@
    "referenced_type" : "type-1066",
    "self_type" : "type-1065",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28912,7 +28912,7 @@
    "referenced_type" : "type-1212",
    "self_type" : "type-1211",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28922,7 +28922,7 @@
    "referenced_type" : "type-1629",
    "self_type" : "type-1628",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28932,7 +28932,7 @@
    "referenced_type" : "type-2182",
    "self_type" : "type-2181",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28942,7 +28942,7 @@
    "referenced_type" : "type-2753",
    "self_type" : "type-2752",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28952,7 +28952,7 @@
    "referenced_type" : "type-2780",
    "self_type" : "type-2779",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28962,7 +28962,7 @@
    "referenced_type" : "type-2972",
    "self_type" : "type-2971",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28972,7 +28972,7 @@
    "referenced_type" : "type-3030",
    "self_type" : "type-3029",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28982,7 +28982,7 @@
    "referenced_type" : "type-3077",
    "self_type" : "type-3076",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28992,7 +28992,7 @@
    "referenced_type" : "type-3147",
    "self_type" : "type-3146",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29002,7 +29002,7 @@
    "referenced_type" : "type-3375",
    "self_type" : "type-3374",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29012,7 +29012,7 @@
    "referenced_type" : "type-3476",
    "self_type" : "type-3475",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29022,7 +29022,7 @@
    "referenced_type" : "type-3495",
    "self_type" : "type-3494",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29032,7 +29032,7 @@
    "referenced_type" : "type-3631",
    "self_type" : "type-3630",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29042,7 +29042,7 @@
    "referenced_type" : "type-3666",
    "self_type" : "type-3665",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29052,7 +29052,7 @@
    "referenced_type" : "type-3713",
    "self_type" : "type-3712",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29062,7 +29062,7 @@
    "referenced_type" : "type-3761",
    "self_type" : "type-3760",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29072,7 +29072,7 @@
    "referenced_type" : "type-3853",
    "self_type" : "type-3852",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29082,7 +29082,7 @@
    "referenced_type" : "type-388",
    "self_type" : "type-387",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29092,7 +29092,7 @@
    "referenced_type" : "type-4128",
    "self_type" : "type-4127",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29102,7 +29102,7 @@
    "referenced_type" : "type-4413",
    "self_type" : "type-4412",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29112,7 +29112,7 @@
    "referenced_type" : "type-456",
    "self_type" : "type-455",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29122,7 +29122,7 @@
    "referenced_type" : "type-794",
    "self_type" : "type-793",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29132,7 +29132,7 @@
    "referenced_type" : "type-887",
    "self_type" : "type-886",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29142,7 +29142,7 @@
    "referenced_type" : "type-950",
    "self_type" : "type-949",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -29162,7 +29162,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-195",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -52778,7 +52778,7 @@
    "referenced_type" : "type-2314",
    "self_type" : "type-2314",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -52811,14 +52811,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2315",
    "self_type" : "type-2315",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -52839,7 +52839,7 @@
    "referenced_type" : "type-2156",
    "self_type" : "type-2156",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -52886,7 +52886,7 @@
    "referenced_type" : "type-2268",
    "self_type" : "type-2268",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -52938,7 +52938,7 @@
    "referenced_type" : "type-2289",
    "self_type" : "type-2289",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -52990,7 +52990,7 @@
    "referenced_type" : "type-2301",
    "self_type" : "type-2301",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -53047,7 +53047,7 @@
    "referenced_type" : "type-2304",
    "self_type" : "type-2304",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/arm_armv7-a-neon/source-based/libstdc++.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libstdc++.so.lsdump
index d0a9087..33440ac 100644
--- a/29/64/arm_armv7-a-neon/source-based/libstdc++.so.lsdump
+++ b/29/64/arm_armv7-a-neon/source-based/libstdc++.so.lsdump
@@ -360,7 +360,7 @@
    "referenced_type" : "type-60",
    "self_type" : "type-60",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-21",
    "unique_id" : "android_LogPriority"
   },
@@ -414,7 +414,7 @@
    "referenced_type" : "type-61",
    "self_type" : "type-61",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-21",
    "unique_id" : "log_id"
   },
diff --git a/29/64/arm_armv8-a/source-based/libOpenMAXAL.so.lsdump b/29/64/arm_armv8-a/source-based/libOpenMAXAL.so.lsdump
index 83692d4..dee28d0 100644
--- a/29/64/arm_armv8-a/source-based/libOpenMAXAL.so.lsdump
+++ b/29/64/arm_armv8-a/source-based/libOpenMAXAL.so.lsdump
@@ -105,7 +105,7 @@
    "name" : "char []",
    "referenced_type" : "type-143",
    "self_type" : "type-814",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -218,7 +218,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-2770",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1026,7 +1026,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2788",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -2563,7 +2563,7 @@
    "referenced_type" : "type-2746",
    "self_type" : "type-2746",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -5037,7 +5037,7 @@
    "referenced_type" : "type-2747",
    "self_type" : "type-2747",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -15938,7 +15938,7 @@
    "referenced_type" : "type-2784",
    "self_type" : "type-2786",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -15947,7 +15947,7 @@
    "referenced_type" : "type-2753",
    "self_type" : "type-2755",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16127,7 +16127,7 @@
    "referenced_type" : "type-2164",
    "self_type" : "type-2176",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16136,7 +16136,7 @@
    "referenced_type" : "type-2359",
    "self_type" : "type-2358",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16145,7 +16145,7 @@
    "referenced_type" : "type-2394",
    "self_type" : "type-2396",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16154,7 +16154,7 @@
    "referenced_type" : "type-2600",
    "self_type" : "type-2602",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16163,7 +16163,7 @@
    "referenced_type" : "type-2749",
    "self_type" : "type-2752",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16172,7 +16172,7 @@
    "referenced_type" : "type-2764",
    "self_type" : "type-2763",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -18704,7 +18704,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-362",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21215,7 +21215,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-162",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21260,7 +21260,7 @@
    "referenced_type" : "type-2784",
    "self_type" : "type-2785",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21269,7 +21269,7 @@
    "referenced_type" : "type-2753",
    "self_type" : "type-2754",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21521,7 +21521,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2787",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21530,7 +21530,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2751",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25803,7 +25803,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-814",
    "self_type" : "type-2756",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28785,7 +28785,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-163",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28855,7 +28855,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2784",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28865,7 +28865,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2753",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -29075,7 +29075,7 @@
    "referenced_type" : "type-2165",
    "self_type" : "type-2164",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29085,7 +29085,7 @@
    "referenced_type" : "type-2360",
    "self_type" : "type-2359",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29095,7 +29095,7 @@
    "referenced_type" : "type-2395",
    "self_type" : "type-2394",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29105,7 +29105,7 @@
    "referenced_type" : "type-2601",
    "self_type" : "type-2600",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29115,7 +29115,7 @@
    "referenced_type" : "type-2750",
    "self_type" : "type-2749",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29125,7 +29125,7 @@
    "referenced_type" : "type-2765",
    "self_type" : "type-2764",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -61062,7 +61062,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2768",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -61095,14 +61095,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2769",
    "self_type" : "type-2769",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -61123,7 +61123,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2748",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -61170,7 +61170,7 @@
    "referenced_type" : "type-2757",
    "self_type" : "type-2757",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -61222,7 +61222,7 @@
    "referenced_type" : "type-2759",
    "self_type" : "type-2759",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -61274,7 +61274,7 @@
    "referenced_type" : "type-2761",
    "self_type" : "type-2761",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -61331,7 +61331,7 @@
    "referenced_type" : "type-2766",
    "self_type" : "type-2766",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/arm_armv8-a/source-based/libOpenSLES.so.lsdump b/29/64/arm_armv8-a/source-based/libOpenSLES.so.lsdump
index 67bba58..7b6d6b5 100644
--- a/29/64/arm_armv8-a/source-based/libOpenSLES.so.lsdump
+++ b/29/64/arm_armv8-a/source-based/libOpenSLES.so.lsdump
@@ -105,7 +105,7 @@
    "name" : "char []",
    "referenced_type" : "type-143",
    "self_type" : "type-814",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -218,7 +218,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-2770",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1062,7 +1062,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2788",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -2599,7 +2599,7 @@
    "referenced_type" : "type-2746",
    "self_type" : "type-2746",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -5073,7 +5073,7 @@
    "referenced_type" : "type-2747",
    "self_type" : "type-2747",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -16046,7 +16046,7 @@
    "referenced_type" : "type-2784",
    "self_type" : "type-2786",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -16055,7 +16055,7 @@
    "referenced_type" : "type-2753",
    "self_type" : "type-2755",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16235,7 +16235,7 @@
    "referenced_type" : "type-2164",
    "self_type" : "type-2176",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16244,7 +16244,7 @@
    "referenced_type" : "type-2359",
    "self_type" : "type-2358",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16253,7 +16253,7 @@
    "referenced_type" : "type-2394",
    "self_type" : "type-2396",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16262,7 +16262,7 @@
    "referenced_type" : "type-2600",
    "self_type" : "type-2602",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16271,7 +16271,7 @@
    "referenced_type" : "type-2749",
    "self_type" : "type-2752",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16280,7 +16280,7 @@
    "referenced_type" : "type-2764",
    "self_type" : "type-2763",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -18812,7 +18812,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-362",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21323,7 +21323,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-162",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21368,7 +21368,7 @@
    "referenced_type" : "type-2784",
    "self_type" : "type-2785",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21377,7 +21377,7 @@
    "referenced_type" : "type-2753",
    "self_type" : "type-2754",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21629,7 +21629,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2787",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21638,7 +21638,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2751",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25911,7 +25911,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-814",
    "self_type" : "type-2756",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28893,7 +28893,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-163",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28963,7 +28963,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2784",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28973,7 +28973,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2753",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -29183,7 +29183,7 @@
    "referenced_type" : "type-2165",
    "self_type" : "type-2164",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29193,7 +29193,7 @@
    "referenced_type" : "type-2360",
    "self_type" : "type-2359",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29203,7 +29203,7 @@
    "referenced_type" : "type-2395",
    "self_type" : "type-2394",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29213,7 +29213,7 @@
    "referenced_type" : "type-2601",
    "self_type" : "type-2600",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29223,7 +29223,7 @@
    "referenced_type" : "type-2750",
    "self_type" : "type-2749",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29233,7 +29233,7 @@
    "referenced_type" : "type-2765",
    "self_type" : "type-2764",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -61170,7 +61170,7 @@
    "referenced_type" : "type-2768",
    "self_type" : "type-2768",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -61203,14 +61203,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2769",
    "self_type" : "type-2769",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -61231,7 +61231,7 @@
    "referenced_type" : "type-2748",
    "self_type" : "type-2748",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -61278,7 +61278,7 @@
    "referenced_type" : "type-2757",
    "self_type" : "type-2757",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -61330,7 +61330,7 @@
    "referenced_type" : "type-2759",
    "self_type" : "type-2759",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -61382,7 +61382,7 @@
    "referenced_type" : "type-2761",
    "self_type" : "type-2761",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -61439,7 +61439,7 @@
    "referenced_type" : "type-2766",
    "self_type" : "type-2766",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/arm_armv8-a/source-based/libRS.so.lsdump b/29/64/arm_armv8-a/source-based/libRS.so.lsdump
index 6157374..ae88b06 100644
--- a/29/64/arm_armv8-a/source-based/libRS.so.lsdump
+++ b/29/64/arm_armv8-a/source-based/libRS.so.lsdump
@@ -389,7 +389,7 @@
    "name" : "char []",
    "referenced_type" : "type-18",
    "self_type" : "type-4053",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 2,
@@ -622,7 +622,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-4066",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1403,7 +1403,7 @@
    "referenced_type" : "type-4071",
    "self_type" : "type-4071",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "AndroidEventLogType"
   },
@@ -4671,7 +4671,7 @@
    "referenced_type" : "type-4032",
    "self_type" : "type-4032",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "android_LogPriority"
   },
@@ -4805,7 +4805,7 @@
    "referenced_type" : "type-4033",
    "self_type" : "type-4033",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "log_id"
   },
@@ -16904,7 +16904,7 @@
    "referenced_type" : "type-4067",
    "self_type" : "type-4069",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -16913,7 +16913,7 @@
    "referenced_type" : "type-4050",
    "self_type" : "type-4052",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -17867,7 +17867,7 @@
    "referenced_type" : "type-4046",
    "self_type" : "type-4049",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -17876,7 +17876,7 @@
    "referenced_type" : "type-6934",
    "self_type" : "type-6935",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "linker_set_key" : "const uniform_int_distribution<_IntType> &",
@@ -20769,7 +20769,7 @@
    "referenced_type" : "type-4067",
    "self_type" : "type-4068",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20778,7 +20778,7 @@
    "referenced_type" : "type-4050",
    "self_type" : "type-4051",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -22947,7 +22947,7 @@
    "referenced_type" : "type-4064",
    "self_type" : "type-4070",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -22956,7 +22956,7 @@
    "referenced_type" : "type-4045",
    "self_type" : "type-4048",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -27650,7 +27650,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-4053",
    "self_type" : "type-4054",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28644,7 +28644,7 @@
    "referenced_type" : "type-4064",
    "self_type" : "type-4067",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28654,7 +28654,7 @@
    "referenced_type" : "type-4045",
    "self_type" : "type-4050",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -30866,7 +30866,7 @@
    "referenced_type" : "type-2487",
    "self_type" : "type-4046",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -30876,7 +30876,7 @@
    "referenced_type" : "type-6928",
    "self_type" : "type-6934",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -42221,7 +42221,7 @@
    "referenced_type" : "type-4064",
    "self_type" : "type-4064",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -42254,14 +42254,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-4065",
    "self_type" : "type-4065",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -42282,7 +42282,7 @@
    "referenced_type" : "type-4045",
    "self_type" : "type-4045",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -42329,7 +42329,7 @@
    "referenced_type" : "type-4055",
    "self_type" : "type-4055",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -42381,7 +42381,7 @@
    "referenced_type" : "type-4057",
    "self_type" : "type-4057",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -42433,7 +42433,7 @@
    "referenced_type" : "type-4060",
    "self_type" : "type-4060",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -42490,7 +42490,7 @@
    "referenced_type" : "type-4062",
    "self_type" : "type-4062",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/arm_armv8-a/source-based/liblog.so.lsdump b/29/64/arm_armv8-a/source-based/liblog.so.lsdump
index bc36d41..d7e06fe 100644
--- a/29/64/arm_armv8-a/source-based/liblog.so.lsdump
+++ b/29/64/arm_armv8-a/source-based/liblog.so.lsdump
@@ -6,7 +6,7 @@
    "name" : "char []",
    "referenced_type" : "type-9",
    "self_type" : "type-8",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -15,7 +15,7 @@
    "referenced_type" : "type-86",
    "self_type" : "type-85",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   }
  ],
  "builtin_types" :
@@ -378,7 +378,7 @@
    "referenced_type" : "type-126",
    "self_type" : "type-126",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -468,7 +468,7 @@
    "referenced_type" : "type-64",
    "self_type" : "type-64",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidLogPrintFormat"
   },
@@ -518,7 +518,7 @@
    "referenced_type" : "type-1",
    "self_type" : "type-1",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -572,7 +572,7 @@
    "referenced_type" : "type-104",
    "self_type" : "type-104",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -626,7 +626,7 @@
    "referenced_type" : "type-32",
    "self_type" : "type-32",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_id.h",
+   "source_file" : "/system/core/liblog/include/log/log_id.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   }
@@ -661,7 +661,7 @@
    "referenced_type" : "type-133",
    "return_type" : "type-6",
    "self_type" : "type-133",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "functions" :
@@ -682,7 +682,7 @@
     }
    ],
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bswrite",
@@ -697,7 +697,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_btwrite",
@@ -718,7 +718,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_buf_print",
@@ -739,7 +739,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_buf_write",
@@ -760,7 +760,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bwrite",
@@ -778,13 +778,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_close",
    "linker_set_key" : "__android_log_close",
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_error_write",
@@ -808,13 +808,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_safetynet.h"
+   "source_file" : "/system/core/liblog/include/log/log_safetynet.h"
   },
   {
    "function_name" : "__android_log_is_debuggable",
    "linker_set_key" : "__android_log_is_debuggable",
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_properties.h"
+   "source_file" : "/system/core/liblog/include/log/log_properties.h"
   },
   {
    "function_name" : "__android_log_is_loggable",
@@ -832,7 +832,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_main.h"
+   "source_file" : "/system/core/liblog/include/log/log_main.h"
   },
   {
    "function_name" : "__android_log_is_loggable_len",
@@ -853,7 +853,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_main.h"
+   "source_file" : "/system/core/liblog/include/log/log_main.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_read",
@@ -877,7 +877,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_write",
@@ -901,7 +901,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_print",
@@ -919,13 +919,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_security",
    "linker_set_key" : "__android_log_security",
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_security_bswrite",
@@ -940,7 +940,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_vprint",
@@ -961,7 +961,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write",
@@ -979,7 +979,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_logger_get_buffer_size",
@@ -991,7 +991,7 @@
     }
    ],
    "return_type" : "type-40",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_logger_property_get_bool",
@@ -1006,7 +1006,7 @@
     }
    ],
    "return_type" : "type-3",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_destroy",
@@ -1018,7 +1018,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_id_to_name",
@@ -1030,7 +1030,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_log_parser_reset",
@@ -1048,7 +1048,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_processBinaryLogBuffer",
@@ -1072,7 +1072,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_processLogBuffer",
@@ -1087,7 +1087,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_read_next",
@@ -1099,7 +1099,7 @@
     }
    ],
    "return_type" : "type-143",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_reset",
@@ -1111,7 +1111,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_float32",
@@ -1126,7 +1126,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int32",
@@ -1141,7 +1141,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int64",
@@ -1156,7 +1156,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list",
@@ -1171,7 +1171,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_begin",
@@ -1183,7 +1183,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_buffer",
@@ -1198,7 +1198,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_write_list_end",
@@ -1210,7 +1210,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8",
@@ -1225,7 +1225,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8_len",
@@ -1243,7 +1243,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_logger_clear",
@@ -1255,7 +1255,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_id",
@@ -1267,7 +1267,7 @@
     }
    ],
    "return_type" : "type-32",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_readable_size",
@@ -1279,7 +1279,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_size",
@@ -1291,7 +1291,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_version",
@@ -1303,7 +1303,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_prune_list",
@@ -1321,7 +1321,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_statistics",
@@ -1339,7 +1339,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc",
@@ -1357,7 +1357,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc_time",
@@ -1375,7 +1375,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_free",
@@ -1387,7 +1387,7 @@
     }
    ],
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_open",
@@ -1408,7 +1408,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_read",
@@ -1423,7 +1423,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_open",
@@ -1438,7 +1438,7 @@
     }
    ],
    "return_type" : "type-37",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_log_size",
@@ -1453,7 +1453,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_prune_list",
@@ -1471,7 +1471,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_lookupEventTagNum",
@@ -1492,7 +1492,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "android_name_to_log_id",
@@ -1504,7 +1504,7 @@
     }
    ],
    "return_type" : "type-104",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_openEventTagMap",
@@ -1516,7 +1516,7 @@
     }
    ],
    "return_type" : "type-81",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "create_android_log_parser",
@@ -1531,7 +1531,7 @@
     }
    ],
    "return_type" : "type-147",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "create_android_logger",
@@ -1543,7 +1543,7 @@
     }
    ],
    "return_type" : "type-147",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "global_vars" : [],
@@ -1556,7 +1556,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-154",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1565,7 +1565,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-115",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1574,7 +1574,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-27",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1583,7 +1583,7 @@
    "referenced_type" : "type-108",
    "self_type" : "type-110",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1592,7 +1592,7 @@
    "referenced_type" : "type-119",
    "self_type" : "type-121",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1601,7 +1601,7 @@
    "referenced_type" : "type-129",
    "self_type" : "type-132",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1610,7 +1610,7 @@
    "referenced_type" : "type-155",
    "self_type" : "type-157",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1619,7 +1619,7 @@
    "referenced_type" : "type-173",
    "self_type" : "type-175",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1628,7 +1628,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-22",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1637,7 +1637,7 @@
    "referenced_type" : "type-200",
    "self_type" : "type-202",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1646,7 +1646,7 @@
    "referenced_type" : "type-227",
    "self_type" : "type-229",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1655,7 +1655,7 @@
    "referenced_type" : "type-242",
    "self_type" : "type-244",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1664,7 +1664,7 @@
    "referenced_type" : "type-253",
    "self_type" : "type-255",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1673,7 +1673,7 @@
    "referenced_type" : "type-262",
    "self_type" : "type-265",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1682,7 +1682,7 @@
    "referenced_type" : "type-274",
    "self_type" : "type-279",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1691,7 +1691,7 @@
    "referenced_type" : "type-285",
    "self_type" : "type-287",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1700,7 +1700,7 @@
    "referenced_type" : "type-293",
    "self_type" : "type-295",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1709,7 +1709,7 @@
    "referenced_type" : "type-309",
    "self_type" : "type-311",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1718,7 +1718,7 @@
    "referenced_type" : "type-319",
    "self_type" : "type-321",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1727,7 +1727,7 @@
    "referenced_type" : "type-351",
    "self_type" : "type-353",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1736,7 +1736,7 @@
    "referenced_type" : "type-359",
    "self_type" : "type-361",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1745,7 +1745,7 @@
    "referenced_type" : "type-391",
    "self_type" : "type-393",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1754,7 +1754,7 @@
    "referenced_type" : "type-422",
    "self_type" : "type-424",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1763,7 +1763,7 @@
    "referenced_type" : "type-433",
    "self_type" : "type-435",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1772,7 +1772,7 @@
    "referenced_type" : "type-441",
    "self_type" : "type-443",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1781,7 +1781,7 @@
    "referenced_type" : "type-449",
    "self_type" : "type-451",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1790,7 +1790,7 @@
    "referenced_type" : "type-459",
    "self_type" : "type-461",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1799,7 +1799,7 @@
    "referenced_type" : "type-467",
    "self_type" : "type-469",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1808,7 +1808,7 @@
    "referenced_type" : "type-478",
    "self_type" : "type-480",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1817,7 +1817,7 @@
    "referenced_type" : "type-488",
    "self_type" : "type-490",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1826,7 +1826,7 @@
    "referenced_type" : "type-56",
    "self_type" : "type-58",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1835,7 +1835,7 @@
    "referenced_type" : "type-92",
    "self_type" : "type-94",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1844,7 +1844,7 @@
    "referenced_type" : "type-102",
    "self_type" : "type-101",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1853,7 +1853,7 @@
    "referenced_type" : "type-111",
    "self_type" : "type-114",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1862,7 +1862,7 @@
    "referenced_type" : "type-123",
    "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1871,7 +1871,7 @@
    "referenced_type" : "type-138",
    "self_type" : "type-137",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1880,7 +1880,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1889,7 +1889,7 @@
    "referenced_type" : "type-141",
    "self_type" : "type-140",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1898,7 +1898,7 @@
    "referenced_type" : "type-168",
    "self_type" : "type-167",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1907,7 +1907,7 @@
    "referenced_type" : "type-178",
    "self_type" : "type-177",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1916,7 +1916,7 @@
    "referenced_type" : "type-181",
    "self_type" : "type-183",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1925,7 +1925,7 @@
    "referenced_type" : "type-190",
    "self_type" : "type-192",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1934,7 +1934,7 @@
    "referenced_type" : "type-193",
    "self_type" : "type-195",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1943,7 +1943,7 @@
    "referenced_type" : "type-204",
    "self_type" : "type-203",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1952,7 +1952,7 @@
    "referenced_type" : "type-217",
    "self_type" : "type-216",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1961,7 +1961,7 @@
    "referenced_type" : "type-221",
    "self_type" : "type-223",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1970,7 +1970,7 @@
    "referenced_type" : "type-233",
    "self_type" : "type-232",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1979,7 +1979,7 @@
    "referenced_type" : "type-237",
    "self_type" : "type-236",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1988,7 +1988,7 @@
    "referenced_type" : "type-245",
    "self_type" : "type-248",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1997,7 +1997,7 @@
    "referenced_type" : "type-25",
    "self_type" : "type-24",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2006,7 +2006,7 @@
    "referenced_type" : "type-257",
    "self_type" : "type-256",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2015,7 +2015,7 @@
    "referenced_type" : "type-269",
    "self_type" : "type-268",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2024,7 +2024,7 @@
    "referenced_type" : "type-277",
    "self_type" : "type-276",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2033,7 +2033,7 @@
    "referenced_type" : "type-28",
    "self_type" : "type-31",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2042,7 +2042,7 @@
    "referenced_type" : "type-281",
    "self_type" : "type-280",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2051,7 +2051,7 @@
    "referenced_type" : "type-289",
    "self_type" : "type-288",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2060,7 +2060,7 @@
    "referenced_type" : "type-300",
    "self_type" : "type-299",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2069,7 +2069,7 @@
    "referenced_type" : "type-314",
    "self_type" : "type-313",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2078,7 +2078,7 @@
    "referenced_type" : "type-324",
    "self_type" : "type-323",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2087,7 +2087,7 @@
    "referenced_type" : "type-327",
    "self_type" : "type-329",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2096,7 +2096,7 @@
    "referenced_type" : "type-336",
    "self_type" : "type-338",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2105,7 +2105,7 @@
    "referenced_type" : "type-340",
    "self_type" : "type-339",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2114,7 +2114,7 @@
    "referenced_type" : "type-343",
    "self_type" : "type-342",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2123,7 +2123,7 @@
    "referenced_type" : "type-346",
    "self_type" : "type-345",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2132,7 +2132,7 @@
    "referenced_type" : "type-355",
    "self_type" : "type-354",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2141,7 +2141,7 @@
    "referenced_type" : "type-363",
    "self_type" : "type-362",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2150,7 +2150,7 @@
    "referenced_type" : "type-367",
    "self_type" : "type-366",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2159,7 +2159,7 @@
    "referenced_type" : "type-369",
    "self_type" : "type-371",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2168,7 +2168,7 @@
    "referenced_type" : "type-378",
    "self_type" : "type-381",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2177,7 +2177,7 @@
    "referenced_type" : "type-382",
    "self_type" : "type-384",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2186,7 +2186,7 @@
    "referenced_type" : "type-395",
    "self_type" : "type-394",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2195,7 +2195,7 @@
    "referenced_type" : "type-410",
    "self_type" : "type-409",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2204,7 +2204,7 @@
    "referenced_type" : "type-413",
    "self_type" : "type-412",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2213,7 +2213,7 @@
    "referenced_type" : "type-417",
    "self_type" : "type-419",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2222,7 +2222,7 @@
    "referenced_type" : "type-429",
    "self_type" : "type-428",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2231,7 +2231,7 @@
    "referenced_type" : "type-43",
    "self_type" : "type-45",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2240,7 +2240,7 @@
    "referenced_type" : "type-436",
    "self_type" : "type-438",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2249,7 +2249,7 @@
    "referenced_type" : "type-445",
    "self_type" : "type-444",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2258,7 +2258,7 @@
    "referenced_type" : "type-455",
    "self_type" : "type-454",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2267,7 +2267,7 @@
    "referenced_type" : "type-46",
    "self_type" : "type-48",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2276,7 +2276,7 @@
    "referenced_type" : "type-463",
    "self_type" : "type-462",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2285,7 +2285,7 @@
    "referenced_type" : "type-471",
    "self_type" : "type-470",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2294,7 +2294,7 @@
    "referenced_type" : "type-474",
    "self_type" : "type-473",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2303,7 +2303,7 @@
    "referenced_type" : "type-60",
    "self_type" : "type-59",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2312,7 +2312,7 @@
    "referenced_type" : "type-79",
    "self_type" : "type-78",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2321,7 +2321,7 @@
    "referenced_type" : "type-87",
    "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2330,7 +2330,7 @@
    "referenced_type" : "type-98",
    "self_type" : "type-97",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   }
  ],
  "pointer_types" :
@@ -2342,7 +2342,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-69",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2351,7 +2351,7 @@
    "referenced_type" : "type-207",
    "self_type" : "type-206",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2360,7 +2360,7 @@
    "referenced_type" : "type-399",
    "self_type" : "type-398",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2369,7 +2369,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-66",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2378,7 +2378,7 @@
    "referenced_type" : "type-220",
    "self_type" : "type-219",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2387,7 +2387,7 @@
    "referenced_type" : "type-416",
    "self_type" : "type-415",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2396,7 +2396,7 @@
    "referenced_type" : "type-82",
    "self_type" : "type-81",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2405,7 +2405,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-105",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2414,7 +2414,7 @@
    "referenced_type" : "type-117",
    "self_type" : "type-116",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2423,7 +2423,7 @@
    "referenced_type" : "type-128",
    "self_type" : "type-127",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2432,7 +2432,7 @@
    "referenced_type" : "type-148",
    "self_type" : "type-147",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2441,7 +2441,7 @@
    "referenced_type" : "type-172",
    "self_type" : "type-171",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2450,7 +2450,7 @@
    "referenced_type" : "type-19",
    "self_type" : "type-18",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2459,7 +2459,7 @@
    "referenced_type" : "type-199",
    "self_type" : "type-198",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2468,7 +2468,7 @@
    "referenced_type" : "type-226",
    "self_type" : "type-225",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2477,7 +2477,7 @@
    "referenced_type" : "type-240",
    "self_type" : "type-239",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2486,7 +2486,7 @@
    "referenced_type" : "type-251",
    "self_type" : "type-250",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2495,7 +2495,7 @@
    "referenced_type" : "type-261",
    "self_type" : "type-260",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2504,7 +2504,7 @@
    "referenced_type" : "type-273",
    "self_type" : "type-272",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2513,7 +2513,7 @@
    "referenced_type" : "type-284",
    "self_type" : "type-283",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2522,7 +2522,7 @@
    "referenced_type" : "type-292",
    "self_type" : "type-291",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2531,7 +2531,7 @@
    "referenced_type" : "type-303",
    "self_type" : "type-302",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2540,7 +2540,7 @@
    "referenced_type" : "type-318",
    "self_type" : "type-317",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2549,7 +2549,7 @@
    "referenced_type" : "type-349",
    "self_type" : "type-348",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2558,7 +2558,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-357",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2567,7 +2567,7 @@
    "referenced_type" : "type-390",
    "self_type" : "type-389",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2576,7 +2576,7 @@
    "referenced_type" : "type-421",
    "self_type" : "type-420",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2585,7 +2585,7 @@
    "referenced_type" : "type-432",
    "self_type" : "type-431",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2594,7 +2594,7 @@
    "referenced_type" : "type-440",
    "self_type" : "type-439",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2603,7 +2603,7 @@
    "referenced_type" : "type-448",
    "self_type" : "type-447",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2612,7 +2612,7 @@
    "referenced_type" : "type-458",
    "self_type" : "type-457",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2621,7 +2621,7 @@
    "referenced_type" : "type-466",
    "self_type" : "type-465",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2630,7 +2630,7 @@
    "referenced_type" : "type-477",
    "self_type" : "type-476",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2639,7 +2639,7 @@
    "referenced_type" : "type-482",
    "self_type" : "type-481",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2648,7 +2648,7 @@
    "referenced_type" : "type-55",
    "self_type" : "type-54",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2657,7 +2657,7 @@
    "referenced_type" : "type-91",
    "self_type" : "type-90",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2666,7 +2666,7 @@
    "referenced_type" : "type-147",
    "self_type" : "type-149",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2675,7 +2675,7 @@
    "referenced_type" : "type-302",
    "self_type" : "type-304",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2684,7 +2684,7 @@
    "referenced_type" : "type-348",
    "self_type" : "type-350",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2693,7 +2693,7 @@
    "referenced_type" : "type-481",
    "self_type" : "type-483",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2702,7 +2702,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-151",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2711,7 +2711,7 @@
    "referenced_type" : "type-9",
    "self_type" : "type-125",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2720,7 +2720,7 @@
    "referenced_type" : "type-73",
    "self_type" : "type-74",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2729,7 +2729,7 @@
    "referenced_type" : "type-210",
    "self_type" : "type-212",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2738,7 +2738,7 @@
    "referenced_type" : "type-230",
    "self_type" : "type-235",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2747,7 +2747,7 @@
    "referenced_type" : "type-402",
    "self_type" : "type-404",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2756,7 +2756,7 @@
    "referenced_type" : "type-425",
    "self_type" : "type-427",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2765,7 +2765,7 @@
    "referenced_type" : "type-70",
    "self_type" : "type-72",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2774,7 +2774,7 @@
    "referenced_type" : "type-95",
    "self_type" : "type-100",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2783,7 +2783,7 @@
    "referenced_type" : "type-152",
    "self_type" : "type-153",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2792,7 +2792,7 @@
    "referenced_type" : "type-12",
    "self_type" : "type-11",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2801,7 +2801,7 @@
    "referenced_type" : "type-11",
    "self_type" : "type-10",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2810,7 +2810,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-113",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2819,7 +2819,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-23",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2828,7 +2828,7 @@
    "referenced_type" : "type-49",
    "self_type" : "type-51",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "alignment" : 4,
@@ -2837,7 +2837,7 @@
    "referenced_type" : "type-133",
    "self_type" : "type-135",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2846,7 +2846,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-118",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2855,7 +2855,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-136",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2864,7 +2864,7 @@
    "referenced_type" : "type-187",
    "self_type" : "type-186",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2873,7 +2873,7 @@
    "referenced_type" : "type-333",
    "self_type" : "type-332",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2882,7 +2882,7 @@
    "referenced_type" : "type-375",
    "self_type" : "type-374",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2891,7 +2891,7 @@
    "referenced_type" : "type-38",
    "self_type" : "type-37",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2900,7 +2900,7 @@
    "referenced_type" : "type-34",
    "self_type" : "type-68",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2909,7 +2909,7 @@
    "referenced_type" : "type-189",
    "self_type" : "type-188",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2918,7 +2918,7 @@
    "referenced_type" : "type-335",
    "self_type" : "type-334",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2927,7 +2927,7 @@
    "referenced_type" : "type-377",
    "self_type" : "type-376",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2936,7 +2936,7 @@
    "referenced_type" : "type-42",
    "self_type" : "type-41",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2945,7 +2945,7 @@
    "referenced_type" : "type-2",
    "self_type" : "type-75",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2954,7 +2954,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-134",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "qualified_types" :
@@ -2965,7 +2965,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-8",
    "self_type" : "type-33",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2975,7 +2975,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-73",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "is_const" : true,
@@ -2983,7 +2983,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-211",
    "self_type" : "type-210",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2993,7 +2993,7 @@
    "referenced_type" : "type-231",
    "self_type" : "type-230",
    "size" : 116,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "is_const" : true,
@@ -3001,7 +3001,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-403",
    "self_type" : "type-402",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -3011,7 +3011,7 @@
    "referenced_type" : "type-426",
    "self_type" : "type-425",
    "size" : 116,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "is_const" : true,
@@ -3019,7 +3019,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-71",
    "self_type" : "type-70",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -3029,7 +3029,7 @@
    "referenced_type" : "type-96",
    "self_type" : "type-95",
    "size" : 116,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -3039,7 +3039,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-152",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -3049,7 +3049,7 @@
    "referenced_type" : "type-9",
    "self_type" : "type-12",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3059,7 +3059,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-107",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -3069,7 +3069,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-16",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3079,7 +3079,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-108",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3089,7 +3089,7 @@
    "referenced_type" : "type-120",
    "self_type" : "type-119",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3099,7 +3099,7 @@
    "referenced_type" : "type-130",
    "self_type" : "type-129",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3109,7 +3109,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-155",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3119,7 +3119,7 @@
    "referenced_type" : "type-174",
    "self_type" : "type-173",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3129,7 +3129,7 @@
    "referenced_type" : "type-201",
    "self_type" : "type-200",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3139,7 +3139,7 @@
    "referenced_type" : "type-21",
    "self_type" : "type-20",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3149,7 +3149,7 @@
    "referenced_type" : "type-228",
    "self_type" : "type-227",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3159,7 +3159,7 @@
    "referenced_type" : "type-243",
    "self_type" : "type-242",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3169,7 +3169,7 @@
    "referenced_type" : "type-254",
    "self_type" : "type-253",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3179,7 +3179,7 @@
    "referenced_type" : "type-263",
    "self_type" : "type-262",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3189,7 +3189,7 @@
    "referenced_type" : "type-275",
    "self_type" : "type-274",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3199,7 +3199,7 @@
    "referenced_type" : "type-286",
    "self_type" : "type-285",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3209,7 +3209,7 @@
    "referenced_type" : "type-294",
    "self_type" : "type-293",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3219,7 +3219,7 @@
    "referenced_type" : "type-310",
    "self_type" : "type-309",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3229,7 +3229,7 @@
    "referenced_type" : "type-320",
    "self_type" : "type-319",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3239,7 +3239,7 @@
    "referenced_type" : "type-352",
    "self_type" : "type-351",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3249,7 +3249,7 @@
    "referenced_type" : "type-360",
    "self_type" : "type-359",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3259,7 +3259,7 @@
    "referenced_type" : "type-392",
    "self_type" : "type-391",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3269,7 +3269,7 @@
    "referenced_type" : "type-423",
    "self_type" : "type-422",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3279,7 +3279,7 @@
    "referenced_type" : "type-434",
    "self_type" : "type-433",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3289,7 +3289,7 @@
    "referenced_type" : "type-442",
    "self_type" : "type-441",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3299,7 +3299,7 @@
    "referenced_type" : "type-450",
    "self_type" : "type-449",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3309,7 +3309,7 @@
    "referenced_type" : "type-460",
    "self_type" : "type-459",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3319,7 +3319,7 @@
    "referenced_type" : "type-468",
    "self_type" : "type-467",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3329,7 +3329,7 @@
    "referenced_type" : "type-479",
    "self_type" : "type-478",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3339,7 +3339,7 @@
    "referenced_type" : "type-489",
    "self_type" : "type-488",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3349,7 +3349,7 @@
    "referenced_type" : "type-57",
    "self_type" : "type-56",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3359,7 +3359,7 @@
    "referenced_type" : "type-93",
    "self_type" : "type-92",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -3369,7 +3369,7 @@
    "referenced_type" : "type-103",
    "self_type" : "type-102",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3379,7 +3379,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-111",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3389,7 +3389,7 @@
    "referenced_type" : "type-124",
    "self_type" : "type-123",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3399,7 +3399,7 @@
    "referenced_type" : "type-139",
    "self_type" : "type-138",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3409,7 +3409,7 @@
    "referenced_type" : "type-142",
    "self_type" : "type-141",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3419,7 +3419,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-14",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3429,7 +3429,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-168",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3439,7 +3439,7 @@
    "referenced_type" : "type-179",
    "self_type" : "type-178",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3449,7 +3449,7 @@
    "referenced_type" : "type-182",
    "self_type" : "type-181",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3459,7 +3459,7 @@
    "referenced_type" : "type-191",
    "self_type" : "type-190",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3469,7 +3469,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-193",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3479,7 +3479,7 @@
    "referenced_type" : "type-205",
    "self_type" : "type-204",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3489,7 +3489,7 @@
    "referenced_type" : "type-218",
    "self_type" : "type-217",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3499,7 +3499,7 @@
    "referenced_type" : "type-222",
    "self_type" : "type-221",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3509,7 +3509,7 @@
    "referenced_type" : "type-234",
    "self_type" : "type-233",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3519,7 +3519,7 @@
    "referenced_type" : "type-238",
    "self_type" : "type-237",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3529,7 +3529,7 @@
    "referenced_type" : "type-246",
    "self_type" : "type-245",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3539,7 +3539,7 @@
    "referenced_type" : "type-258",
    "self_type" : "type-257",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3549,7 +3549,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3559,7 +3559,7 @@
    "referenced_type" : "type-270",
    "self_type" : "type-269",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3569,7 +3569,7 @@
    "referenced_type" : "type-278",
    "self_type" : "type-277",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3579,7 +3579,7 @@
    "referenced_type" : "type-282",
    "self_type" : "type-281",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3589,7 +3589,7 @@
    "referenced_type" : "type-290",
    "self_type" : "type-289",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3599,7 +3599,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-28",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3609,7 +3609,7 @@
    "referenced_type" : "type-301",
    "self_type" : "type-300",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3619,7 +3619,7 @@
    "referenced_type" : "type-315",
    "self_type" : "type-314",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3629,7 +3629,7 @@
    "referenced_type" : "type-325",
    "self_type" : "type-324",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3639,7 +3639,7 @@
    "referenced_type" : "type-328",
    "self_type" : "type-327",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3649,7 +3649,7 @@
    "referenced_type" : "type-337",
    "self_type" : "type-336",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3659,7 +3659,7 @@
    "referenced_type" : "type-341",
    "self_type" : "type-340",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3669,7 +3669,7 @@
    "referenced_type" : "type-344",
    "self_type" : "type-343",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3679,7 +3679,7 @@
    "referenced_type" : "type-347",
    "self_type" : "type-346",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3689,7 +3689,7 @@
    "referenced_type" : "type-356",
    "self_type" : "type-355",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3699,7 +3699,7 @@
    "referenced_type" : "type-364",
    "self_type" : "type-363",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3709,7 +3709,7 @@
    "referenced_type" : "type-368",
    "self_type" : "type-367",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3719,7 +3719,7 @@
    "referenced_type" : "type-370",
    "self_type" : "type-369",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3729,7 +3729,7 @@
    "referenced_type" : "type-379",
    "self_type" : "type-378",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3739,7 +3739,7 @@
    "referenced_type" : "type-383",
    "self_type" : "type-382",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3749,7 +3749,7 @@
    "referenced_type" : "type-396",
    "self_type" : "type-395",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3759,7 +3759,7 @@
    "referenced_type" : "type-411",
    "self_type" : "type-410",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3769,7 +3769,7 @@
    "referenced_type" : "type-414",
    "self_type" : "type-413",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3779,7 +3779,7 @@
    "referenced_type" : "type-418",
    "self_type" : "type-417",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3789,7 +3789,7 @@
    "referenced_type" : "type-430",
    "self_type" : "type-429",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3799,7 +3799,7 @@
    "referenced_type" : "type-437",
    "self_type" : "type-436",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3809,7 +3809,7 @@
    "referenced_type" : "type-446",
    "self_type" : "type-445",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3819,7 +3819,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-43",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3829,7 +3829,7 @@
    "referenced_type" : "type-456",
    "self_type" : "type-455",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3839,7 +3839,7 @@
    "referenced_type" : "type-464",
    "self_type" : "type-463",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3849,7 +3849,7 @@
    "referenced_type" : "type-472",
    "self_type" : "type-471",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3859,7 +3859,7 @@
    "referenced_type" : "type-475",
    "self_type" : "type-474",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3869,7 +3869,7 @@
    "referenced_type" : "type-47",
    "self_type" : "type-46",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3879,7 +3879,7 @@
    "referenced_type" : "type-61",
    "self_type" : "type-60",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3889,7 +3889,7 @@
    "referenced_type" : "type-80",
    "self_type" : "type-79",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3899,7 +3899,7 @@
    "referenced_type" : "type-88",
    "self_type" : "type-87",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3909,7 +3909,7 @@
    "referenced_type" : "type-99",
    "self_type" : "type-98",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3919,7 +3919,7 @@
    "referenced_type" : "type-2",
    "self_type" : "type-131",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "is_const" : true,
@@ -3927,7 +3927,7 @@
    "name" : "const void",
    "referenced_type" : "type-50",
    "self_type" : "type-49",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   }
  ],
  "record_types" :
@@ -3991,7 +3991,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-65",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "unique_id" : "AndroidLogEntry_t"
   },
   {
@@ -4008,7 +4008,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-5",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_header_t"
   },
   {
@@ -4030,7 +4030,7 @@
    "referenced_type" : "type-160",
    "self_type" : "type-160",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_int_t"
   },
   {
@@ -4052,7 +4052,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-162",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_long_t"
   },
   {
@@ -4079,7 +4079,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-164",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_string_t"
   },
   {
@@ -4101,7 +4101,7 @@
    "referenced_type" : "type-161",
    "self_type" : "type-161",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_int_t"
   },
   {
@@ -4126,7 +4126,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-150",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
    "unique_id" : "_ZTS22android_log_event_list"
   },
   {
@@ -4148,7 +4148,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-163",
    "size" : 13,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_long_t"
   },
   {
@@ -4180,7 +4180,7 @@
    "referenced_type" : "type-4",
    "self_type" : "type-4",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_string_t"
   },
   {
@@ -4207,7 +4207,7 @@
    "referenced_type" : "type-159",
    "self_type" : "type-159",
    "size" : 11,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_header_t"
   },
   {
@@ -4239,7 +4239,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-143",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
    "unique_id" : "android_log_list_element"
   },
   {
@@ -4264,14 +4264,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3) at system/logging/liblog/include/log/log_event_list.h:53:3",
-   "name" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3) at system/logging/liblog/include/log/log_event_list.h:53:3",
+   "linker_set_key" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3) at system/core/liblog/include/log/log_event_list.h:53:3",
+   "name" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3) at system/core/liblog/include/log/log_event_list.h:53:3",
    "record_kind" : "union",
    "referenced_type" : "type-144",
    "self_type" : "type-144",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
-   "unique_id" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3)"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
+   "unique_id" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3)"
   },
   {
    "alignment" : 1,
@@ -4302,7 +4302,7 @@
    "referenced_type" : "type-158",
    "self_type" : "type-158",
    "size" : 7,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_pmsg_log_header_t"
   },
   {
@@ -4318,7 +4318,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-83",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -4351,14 +4351,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-84",
    "self_type" : "type-84",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -4379,7 +4379,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-17",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -4426,7 +4426,7 @@
    "referenced_type" : "type-34",
    "self_type" : "type-34",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -4478,7 +4478,7 @@
    "referenced_type" : "type-52",
    "self_type" : "type-52",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -4530,7 +4530,7 @@
    "referenced_type" : "type-62",
    "self_type" : "type-62",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -4587,7 +4587,7 @@
    "referenced_type" : "type-76",
    "self_type" : "type-76",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   }
  ],
diff --git a/29/64/arm_armv8-a/source-based/libmediandk.so.lsdump b/29/64/arm_armv8-a/source-based/libmediandk.so.lsdump
index d69d0e0..138814b 100644
--- a/29/64/arm_armv8-a/source-based/libmediandk.so.lsdump
+++ b/29/64/arm_armv8-a/source-based/libmediandk.so.lsdump
@@ -203,7 +203,7 @@
    "name" : "char []",
    "referenced_type" : "type-42",
    "self_type" : "type-2245",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -308,7 +308,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-2316",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -2045,7 +2045,7 @@
    "referenced_type" : "type-2377",
    "self_type" : "type-2377",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "AndroidEventLogType"
   },
@@ -4756,7 +4756,7 @@
    "referenced_type" : "type-2131",
    "self_type" : "type-2131",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "android_LogPriority"
   },
@@ -7238,7 +7238,7 @@
    "referenced_type" : "type-2143",
    "self_type" : "type-2143",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "log_id"
   },
@@ -13607,7 +13607,7 @@
    "referenced_type" : "type-2333",
    "self_type" : "type-2357",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -13616,7 +13616,7 @@
    "referenced_type" : "type-2215",
    "self_type" : "type-2234",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13769,7 +13769,7 @@
    "referenced_type" : "type-1065",
    "self_type" : "type-1067",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13778,7 +13778,7 @@
    "referenced_type" : "type-1211",
    "self_type" : "type-1210",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13787,7 +13787,7 @@
    "referenced_type" : "type-1628",
    "self_type" : "type-1627",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13796,7 +13796,7 @@
    "referenced_type" : "type-2181",
    "self_type" : "type-2206",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13805,7 +13805,7 @@
    "referenced_type" : "type-2752",
    "self_type" : "type-2754",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13814,7 +13814,7 @@
    "referenced_type" : "type-2779",
    "self_type" : "type-2781",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13823,7 +13823,7 @@
    "referenced_type" : "type-2971",
    "self_type" : "type-2977",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13832,7 +13832,7 @@
    "referenced_type" : "type-3029",
    "self_type" : "type-3033",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13841,7 +13841,7 @@
    "referenced_type" : "type-3076",
    "self_type" : "type-3078",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13850,7 +13850,7 @@
    "referenced_type" : "type-3146",
    "self_type" : "type-3148",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13859,7 +13859,7 @@
    "referenced_type" : "type-3374",
    "self_type" : "type-3376",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13868,7 +13868,7 @@
    "referenced_type" : "type-3475",
    "self_type" : "type-3477",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13877,7 +13877,7 @@
    "referenced_type" : "type-3494",
    "self_type" : "type-3496",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13886,7 +13886,7 @@
    "referenced_type" : "type-3630",
    "self_type" : "type-3636",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13895,7 +13895,7 @@
    "referenced_type" : "type-3665",
    "self_type" : "type-3669",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13904,7 +13904,7 @@
    "referenced_type" : "type-3712",
    "self_type" : "type-3714",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13913,7 +13913,7 @@
    "referenced_type" : "type-3760",
    "self_type" : "type-3764",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13922,7 +13922,7 @@
    "referenced_type" : "type-3852",
    "self_type" : "type-3851",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13931,7 +13931,7 @@
    "referenced_type" : "type-387",
    "self_type" : "type-389",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13940,7 +13940,7 @@
    "referenced_type" : "type-4127",
    "self_type" : "type-4126",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13949,7 +13949,7 @@
    "referenced_type" : "type-4412",
    "self_type" : "type-4420",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13958,7 +13958,7 @@
    "referenced_type" : "type-455",
    "self_type" : "type-457",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13967,7 +13967,7 @@
    "referenced_type" : "type-793",
    "self_type" : "type-799",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13976,7 +13976,7 @@
    "referenced_type" : "type-886",
    "self_type" : "type-890",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13985,7 +13985,7 @@
    "referenced_type" : "type-949",
    "self_type" : "type-951",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -22115,7 +22115,7 @@
    "referenced_type" : "type-2333",
    "self_type" : "type-2356",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -22124,7 +22124,7 @@
    "referenced_type" : "type-2215",
    "self_type" : "type-2224",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -22628,7 +22628,7 @@
    "referenced_type" : "type-2314",
    "self_type" : "type-2367",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -22637,7 +22637,7 @@
    "referenced_type" : "type-2156",
    "self_type" : "type-2195",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -23372,7 +23372,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-2245",
    "self_type" : "type-2261",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -26312,7 +26312,7 @@
    "referenced_type" : "type-2314",
    "self_type" : "type-2333",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -26322,7 +26322,7 @@
    "referenced_type" : "type-2156",
    "self_type" : "type-2215",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28902,7 +28902,7 @@
    "referenced_type" : "type-1066",
    "self_type" : "type-1065",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28912,7 +28912,7 @@
    "referenced_type" : "type-1212",
    "self_type" : "type-1211",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28922,7 +28922,7 @@
    "referenced_type" : "type-1629",
    "self_type" : "type-1628",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28932,7 +28932,7 @@
    "referenced_type" : "type-2182",
    "self_type" : "type-2181",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28942,7 +28942,7 @@
    "referenced_type" : "type-2753",
    "self_type" : "type-2752",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28952,7 +28952,7 @@
    "referenced_type" : "type-2780",
    "self_type" : "type-2779",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28962,7 +28962,7 @@
    "referenced_type" : "type-2972",
    "self_type" : "type-2971",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28972,7 +28972,7 @@
    "referenced_type" : "type-3030",
    "self_type" : "type-3029",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28982,7 +28982,7 @@
    "referenced_type" : "type-3077",
    "self_type" : "type-3076",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28992,7 +28992,7 @@
    "referenced_type" : "type-3147",
    "self_type" : "type-3146",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29002,7 +29002,7 @@
    "referenced_type" : "type-3375",
    "self_type" : "type-3374",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29012,7 +29012,7 @@
    "referenced_type" : "type-3476",
    "self_type" : "type-3475",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29022,7 +29022,7 @@
    "referenced_type" : "type-3495",
    "self_type" : "type-3494",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29032,7 +29032,7 @@
    "referenced_type" : "type-3631",
    "self_type" : "type-3630",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29042,7 +29042,7 @@
    "referenced_type" : "type-3666",
    "self_type" : "type-3665",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29052,7 +29052,7 @@
    "referenced_type" : "type-3713",
    "self_type" : "type-3712",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29062,7 +29062,7 @@
    "referenced_type" : "type-3761",
    "self_type" : "type-3760",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29072,7 +29072,7 @@
    "referenced_type" : "type-3853",
    "self_type" : "type-3852",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29082,7 +29082,7 @@
    "referenced_type" : "type-388",
    "self_type" : "type-387",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29092,7 +29092,7 @@
    "referenced_type" : "type-4128",
    "self_type" : "type-4127",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29102,7 +29102,7 @@
    "referenced_type" : "type-4413",
    "self_type" : "type-4412",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29112,7 +29112,7 @@
    "referenced_type" : "type-456",
    "self_type" : "type-455",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29122,7 +29122,7 @@
    "referenced_type" : "type-794",
    "self_type" : "type-793",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29132,7 +29132,7 @@
    "referenced_type" : "type-887",
    "self_type" : "type-886",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29142,7 +29142,7 @@
    "referenced_type" : "type-950",
    "self_type" : "type-949",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -29162,7 +29162,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-195",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -52778,7 +52778,7 @@
    "referenced_type" : "type-2314",
    "self_type" : "type-2314",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -52811,14 +52811,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2315",
    "self_type" : "type-2315",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -52839,7 +52839,7 @@
    "referenced_type" : "type-2156",
    "self_type" : "type-2156",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -52886,7 +52886,7 @@
    "referenced_type" : "type-2268",
    "self_type" : "type-2268",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -52938,7 +52938,7 @@
    "referenced_type" : "type-2289",
    "self_type" : "type-2289",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -52990,7 +52990,7 @@
    "referenced_type" : "type-2301",
    "self_type" : "type-2301",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -53047,7 +53047,7 @@
    "referenced_type" : "type-2304",
    "self_type" : "type-2304",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/arm_armv8-a/source-based/libstdc++.so.lsdump b/29/64/arm_armv8-a/source-based/libstdc++.so.lsdump
index d0a9087..33440ac 100644
--- a/29/64/arm_armv8-a/source-based/libstdc++.so.lsdump
+++ b/29/64/arm_armv8-a/source-based/libstdc++.so.lsdump
@@ -360,7 +360,7 @@
    "referenced_type" : "type-60",
    "self_type" : "type-60",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-21",
    "unique_id" : "android_LogPriority"
   },
@@ -414,7 +414,7 @@
    "referenced_type" : "type-61",
    "self_type" : "type-61",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-21",
    "unique_id" : "log_id"
   },
diff --git a/29/64/x86/source-based/libOpenMAXAL.so.lsdump b/29/64/x86/source-based/libOpenMAXAL.so.lsdump
index 6abefaf..0dd04e4 100644
--- a/29/64/x86/source-based/libOpenMAXAL.so.lsdump
+++ b/29/64/x86/source-based/libOpenMAXAL.so.lsdump
@@ -105,7 +105,7 @@
    "name" : "char []",
    "referenced_type" : "type-143",
    "self_type" : "type-814",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -218,7 +218,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-2594",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1017,7 +1017,7 @@
    "referenced_type" : "type-2612",
    "self_type" : "type-2612",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -2554,7 +2554,7 @@
    "referenced_type" : "type-2573",
    "self_type" : "type-2573",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -5028,7 +5028,7 @@
    "referenced_type" : "type-2574",
    "self_type" : "type-2574",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -15893,7 +15893,7 @@
    "referenced_type" : "type-2608",
    "self_type" : "type-2610",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -15902,7 +15902,7 @@
    "referenced_type" : "type-2580",
    "self_type" : "type-2582",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16010,7 +16010,7 @@
    "referenced_type" : "type-2164",
    "self_type" : "type-2176",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16019,7 +16019,7 @@
    "referenced_type" : "type-2359",
    "self_type" : "type-2358",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16028,7 +16028,7 @@
    "referenced_type" : "type-2576",
    "self_type" : "type-2579",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -18056,7 +18056,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-362",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20531,7 +20531,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-162",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20576,7 +20576,7 @@
    "referenced_type" : "type-2608",
    "self_type" : "type-2609",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20585,7 +20585,7 @@
    "referenced_type" : "type-2580",
    "self_type" : "type-2581",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20837,7 +20837,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2611",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20846,7 +20846,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2578",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25099,7 +25099,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-814",
    "self_type" : "type-2583",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -27985,7 +27985,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-163",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28055,7 +28055,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2608",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28065,7 +28065,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2580",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28195,7 +28195,7 @@
    "referenced_type" : "type-2165",
    "self_type" : "type-2164",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28205,7 +28205,7 @@
    "referenced_type" : "type-2360",
    "self_type" : "type-2359",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28215,7 +28215,7 @@
    "referenced_type" : "type-2577",
    "self_type" : "type-2576",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -60152,7 +60152,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2592",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -60185,14 +60185,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2593",
    "self_type" : "type-2593",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -60213,7 +60213,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2575",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -60260,7 +60260,7 @@
    "referenced_type" : "type-2584",
    "self_type" : "type-2584",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -60312,7 +60312,7 @@
    "referenced_type" : "type-2586",
    "self_type" : "type-2586",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -60364,7 +60364,7 @@
    "referenced_type" : "type-2588",
    "self_type" : "type-2588",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -60421,7 +60421,7 @@
    "referenced_type" : "type-2590",
    "self_type" : "type-2590",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/x86/source-based/libOpenSLES.so.lsdump b/29/64/x86/source-based/libOpenSLES.so.lsdump
index be5f24b..b755e17 100644
--- a/29/64/x86/source-based/libOpenSLES.so.lsdump
+++ b/29/64/x86/source-based/libOpenSLES.so.lsdump
@@ -105,7 +105,7 @@
    "name" : "char []",
    "referenced_type" : "type-143",
    "self_type" : "type-814",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -218,7 +218,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-2594",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1053,7 +1053,7 @@
    "referenced_type" : "type-2612",
    "self_type" : "type-2612",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -2590,7 +2590,7 @@
    "referenced_type" : "type-2573",
    "self_type" : "type-2573",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -5064,7 +5064,7 @@
    "referenced_type" : "type-2574",
    "self_type" : "type-2574",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -16001,7 +16001,7 @@
    "referenced_type" : "type-2608",
    "self_type" : "type-2610",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -16010,7 +16010,7 @@
    "referenced_type" : "type-2580",
    "self_type" : "type-2582",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16118,7 +16118,7 @@
    "referenced_type" : "type-2164",
    "self_type" : "type-2176",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16127,7 +16127,7 @@
    "referenced_type" : "type-2359",
    "self_type" : "type-2358",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16136,7 +16136,7 @@
    "referenced_type" : "type-2576",
    "self_type" : "type-2579",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -18164,7 +18164,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-362",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20639,7 +20639,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-162",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20684,7 +20684,7 @@
    "referenced_type" : "type-2608",
    "self_type" : "type-2609",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20693,7 +20693,7 @@
    "referenced_type" : "type-2580",
    "self_type" : "type-2581",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20945,7 +20945,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2611",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20954,7 +20954,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2578",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25207,7 +25207,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-814",
    "self_type" : "type-2583",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28093,7 +28093,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-163",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28163,7 +28163,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2608",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28173,7 +28173,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2580",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28303,7 +28303,7 @@
    "referenced_type" : "type-2165",
    "self_type" : "type-2164",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28313,7 +28313,7 @@
    "referenced_type" : "type-2360",
    "self_type" : "type-2359",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28323,7 +28323,7 @@
    "referenced_type" : "type-2577",
    "self_type" : "type-2576",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -60260,7 +60260,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2592",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -60293,14 +60293,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2593",
    "self_type" : "type-2593",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -60321,7 +60321,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2575",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -60368,7 +60368,7 @@
    "referenced_type" : "type-2584",
    "self_type" : "type-2584",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -60420,7 +60420,7 @@
    "referenced_type" : "type-2586",
    "self_type" : "type-2586",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -60472,7 +60472,7 @@
    "referenced_type" : "type-2588",
    "self_type" : "type-2588",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -60529,7 +60529,7 @@
    "referenced_type" : "type-2590",
    "self_type" : "type-2590",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/x86/source-based/libRS.so.lsdump b/29/64/x86/source-based/libRS.so.lsdump
index 0b3e021..5dd9979 100644
--- a/29/64/x86/source-based/libRS.so.lsdump
+++ b/29/64/x86/source-based/libRS.so.lsdump
@@ -400,7 +400,7 @@
    "name" : "char []",
    "referenced_type" : "type-18",
    "self_type" : "type-4016",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 2,
@@ -642,7 +642,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-4029",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1394,7 +1394,7 @@
    "referenced_type" : "type-4036",
    "self_type" : "type-4036",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "AndroidEventLogType"
   },
@@ -4284,7 +4284,7 @@
    "referenced_type" : "type-3996",
    "self_type" : "type-3996",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "android_LogPriority"
   },
@@ -4418,7 +4418,7 @@
    "referenced_type" : "type-3997",
    "self_type" : "type-3997",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "log_id"
   },
@@ -16315,7 +16315,7 @@
    "referenced_type" : "type-4032",
    "self_type" : "type-4034",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -16324,7 +16324,7 @@
    "referenced_type" : "type-4012",
    "self_type" : "type-4014",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -17278,7 +17278,7 @@
    "referenced_type" : "type-4009",
    "self_type" : "type-4011",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -17287,7 +17287,7 @@
    "referenced_type" : "type-6899",
    "self_type" : "type-6900",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "linker_set_key" : "const uniform_int_distribution<_IntType> &",
@@ -19887,7 +19887,7 @@
    "referenced_type" : "type-4032",
    "self_type" : "type-4033",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -19896,7 +19896,7 @@
    "referenced_type" : "type-4012",
    "self_type" : "type-4013",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21867,7 +21867,7 @@
    "referenced_type" : "type-4027",
    "self_type" : "type-4035",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21876,7 +21876,7 @@
    "referenced_type" : "type-4007",
    "self_type" : "type-4010",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -26379,7 +26379,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-4016",
    "self_type" : "type-4017",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -27131,7 +27131,7 @@
    "referenced_type" : "type-4027",
    "self_type" : "type-4032",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -27141,7 +27141,7 @@
    "referenced_type" : "type-4007",
    "self_type" : "type-4012",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29327,7 +29327,7 @@
    "referenced_type" : "type-2415",
    "self_type" : "type-4009",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29337,7 +29337,7 @@
    "referenced_type" : "type-6891",
    "self_type" : "type-6899",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -36872,7 +36872,7 @@
    "referenced_type" : "type-4027",
    "self_type" : "type-4027",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -36905,14 +36905,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-4028",
    "self_type" : "type-4028",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -36933,7 +36933,7 @@
    "referenced_type" : "type-4007",
    "self_type" : "type-4007",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -36980,7 +36980,7 @@
    "referenced_type" : "type-4018",
    "self_type" : "type-4018",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -37032,7 +37032,7 @@
    "referenced_type" : "type-4021",
    "self_type" : "type-4021",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -37084,7 +37084,7 @@
    "referenced_type" : "type-4023",
    "self_type" : "type-4023",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -37141,7 +37141,7 @@
    "referenced_type" : "type-4025",
    "self_type" : "type-4025",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/x86/source-based/liblog.so.lsdump b/29/64/x86/source-based/liblog.so.lsdump
index 83bd212..5699e3a 100644
--- a/29/64/x86/source-based/liblog.so.lsdump
+++ b/29/64/x86/source-based/liblog.so.lsdump
@@ -6,7 +6,7 @@
    "name" : "char []",
    "referenced_type" : "type-9",
    "self_type" : "type-8",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -15,7 +15,7 @@
    "referenced_type" : "type-86",
    "self_type" : "type-85",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   }
  ],
  "builtin_types" :
@@ -352,7 +352,7 @@
    "referenced_type" : "type-126",
    "self_type" : "type-126",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -442,7 +442,7 @@
    "referenced_type" : "type-64",
    "self_type" : "type-64",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidLogPrintFormat"
   },
@@ -492,7 +492,7 @@
    "referenced_type" : "type-1",
    "self_type" : "type-1",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -546,7 +546,7 @@
    "referenced_type" : "type-104",
    "self_type" : "type-104",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -600,7 +600,7 @@
    "referenced_type" : "type-32",
    "self_type" : "type-32",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_id.h",
+   "source_file" : "/system/core/liblog/include/log/log_id.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   }
@@ -635,7 +635,7 @@
    "referenced_type" : "type-133",
    "return_type" : "type-6",
    "self_type" : "type-133",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "functions" :
@@ -656,7 +656,7 @@
     }
    ],
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bswrite",
@@ -671,7 +671,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_btwrite",
@@ -692,7 +692,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_buf_print",
@@ -713,7 +713,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_buf_write",
@@ -734,7 +734,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bwrite",
@@ -752,13 +752,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_close",
    "linker_set_key" : "__android_log_close",
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_error_write",
@@ -782,13 +782,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_safetynet.h"
+   "source_file" : "/system/core/liblog/include/log/log_safetynet.h"
   },
   {
    "function_name" : "__android_log_is_debuggable",
    "linker_set_key" : "__android_log_is_debuggable",
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_properties.h"
+   "source_file" : "/system/core/liblog/include/log/log_properties.h"
   },
   {
    "function_name" : "__android_log_is_loggable",
@@ -806,7 +806,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_main.h"
+   "source_file" : "/system/core/liblog/include/log/log_main.h"
   },
   {
    "function_name" : "__android_log_is_loggable_len",
@@ -827,7 +827,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_main.h"
+   "source_file" : "/system/core/liblog/include/log/log_main.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_read",
@@ -851,7 +851,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_write",
@@ -875,7 +875,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_print",
@@ -893,13 +893,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_security",
    "linker_set_key" : "__android_log_security",
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_security_bswrite",
@@ -914,7 +914,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_vprint",
@@ -935,7 +935,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write",
@@ -953,7 +953,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_logger_get_buffer_size",
@@ -965,7 +965,7 @@
     }
    ],
    "return_type" : "type-40",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_logger_property_get_bool",
@@ -980,7 +980,7 @@
     }
    ],
    "return_type" : "type-3",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_destroy",
@@ -992,7 +992,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_id_to_name",
@@ -1004,7 +1004,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_log_parser_reset",
@@ -1022,7 +1022,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_processBinaryLogBuffer",
@@ -1046,7 +1046,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_processLogBuffer",
@@ -1061,7 +1061,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_read_next",
@@ -1073,7 +1073,7 @@
     }
    ],
    "return_type" : "type-143",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_reset",
@@ -1085,7 +1085,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_float32",
@@ -1100,7 +1100,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int32",
@@ -1115,7 +1115,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int64",
@@ -1130,7 +1130,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list",
@@ -1145,7 +1145,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_begin",
@@ -1157,7 +1157,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_buffer",
@@ -1172,7 +1172,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_write_list_end",
@@ -1184,7 +1184,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8",
@@ -1199,7 +1199,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8_len",
@@ -1217,7 +1217,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_logger_clear",
@@ -1229,7 +1229,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_id",
@@ -1241,7 +1241,7 @@
     }
    ],
    "return_type" : "type-32",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_readable_size",
@@ -1253,7 +1253,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_size",
@@ -1265,7 +1265,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_version",
@@ -1277,7 +1277,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_prune_list",
@@ -1295,7 +1295,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_statistics",
@@ -1313,7 +1313,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc",
@@ -1331,7 +1331,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc_time",
@@ -1349,7 +1349,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_free",
@@ -1361,7 +1361,7 @@
     }
    ],
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_open",
@@ -1382,7 +1382,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_read",
@@ -1397,7 +1397,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_open",
@@ -1412,7 +1412,7 @@
     }
    ],
    "return_type" : "type-37",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_log_size",
@@ -1427,7 +1427,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_prune_list",
@@ -1445,7 +1445,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_lookupEventTagNum",
@@ -1466,7 +1466,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "android_name_to_log_id",
@@ -1478,7 +1478,7 @@
     }
    ],
    "return_type" : "type-104",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_openEventTagMap",
@@ -1490,7 +1490,7 @@
     }
    ],
    "return_type" : "type-81",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "create_android_log_parser",
@@ -1505,7 +1505,7 @@
     }
    ],
    "return_type" : "type-147",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "create_android_logger",
@@ -1517,7 +1517,7 @@
     }
    ],
    "return_type" : "type-147",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "global_vars" : [],
@@ -1530,7 +1530,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-154",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1539,7 +1539,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-115",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1548,7 +1548,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-27",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1557,7 +1557,7 @@
    "referenced_type" : "type-108",
    "self_type" : "type-110",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1566,7 +1566,7 @@
    "referenced_type" : "type-118",
    "self_type" : "type-121",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1575,7 +1575,7 @@
    "referenced_type" : "type-129",
    "self_type" : "type-132",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1584,7 +1584,7 @@
    "referenced_type" : "type-155",
    "self_type" : "type-157",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1593,7 +1593,7 @@
    "referenced_type" : "type-172",
    "self_type" : "type-174",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1602,7 +1602,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-22",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1611,7 +1611,7 @@
    "referenced_type" : "type-204",
    "self_type" : "type-206",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1620,7 +1620,7 @@
    "referenced_type" : "type-212",
    "self_type" : "type-214",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1629,7 +1629,7 @@
    "referenced_type" : "type-244",
    "self_type" : "type-246",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1638,7 +1638,7 @@
    "referenced_type" : "type-275",
    "self_type" : "type-277",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1647,7 +1647,7 @@
    "referenced_type" : "type-286",
    "self_type" : "type-288",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1656,7 +1656,7 @@
    "referenced_type" : "type-294",
    "self_type" : "type-296",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1665,7 +1665,7 @@
    "referenced_type" : "type-302",
    "self_type" : "type-304",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1674,7 +1674,7 @@
    "referenced_type" : "type-312",
    "self_type" : "type-314",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1683,7 +1683,7 @@
    "referenced_type" : "type-320",
    "self_type" : "type-322",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1692,7 +1692,7 @@
    "referenced_type" : "type-331",
    "self_type" : "type-333",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1701,7 +1701,7 @@
    "referenced_type" : "type-341",
    "self_type" : "type-343",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1710,7 +1710,7 @@
    "referenced_type" : "type-56",
    "self_type" : "type-58",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1719,7 +1719,7 @@
    "referenced_type" : "type-92",
    "self_type" : "type-94",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1728,7 +1728,7 @@
    "referenced_type" : "type-102",
    "self_type" : "type-101",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1737,7 +1737,7 @@
    "referenced_type" : "type-111",
    "self_type" : "type-114",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1746,7 +1746,7 @@
    "referenced_type" : "type-123",
    "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1755,7 +1755,7 @@
    "referenced_type" : "type-138",
    "self_type" : "type-137",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1764,7 +1764,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1773,7 +1773,7 @@
    "referenced_type" : "type-141",
    "self_type" : "type-140",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1782,7 +1782,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-166",
    "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" : "type-177",
    "self_type" : "type-176",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1800,7 +1800,7 @@
    "referenced_type" : "type-180",
    "self_type" : "type-182",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1809,7 +1809,7 @@
    "referenced_type" : "type-189",
    "self_type" : "type-191",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1818,7 +1818,7 @@
    "referenced_type" : "type-193",
    "self_type" : "type-192",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1827,7 +1827,7 @@
    "referenced_type" : "type-196",
    "self_type" : "type-195",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1836,7 +1836,7 @@
    "referenced_type" : "type-199",
    "self_type" : "type-198",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1845,7 +1845,7 @@
    "referenced_type" : "type-208",
    "self_type" : "type-207",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1854,7 +1854,7 @@
    "referenced_type" : "type-216",
    "self_type" : "type-215",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1863,7 +1863,7 @@
    "referenced_type" : "type-220",
    "self_type" : "type-219",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1872,7 +1872,7 @@
    "referenced_type" : "type-222",
    "self_type" : "type-224",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1881,7 +1881,7 @@
    "referenced_type" : "type-231",
    "self_type" : "type-234",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1890,7 +1890,7 @@
    "referenced_type" : "type-235",
    "self_type" : "type-237",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1899,7 +1899,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-247",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1908,7 +1908,7 @@
    "referenced_type" : "type-25",
    "self_type" : "type-24",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1917,7 +1917,7 @@
    "referenced_type" : "type-263",
    "self_type" : "type-262",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1926,7 +1926,7 @@
    "referenced_type" : "type-266",
    "self_type" : "type-265",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1935,7 +1935,7 @@
    "referenced_type" : "type-270",
    "self_type" : "type-272",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1944,7 +1944,7 @@
    "referenced_type" : "type-28",
    "self_type" : "type-31",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1953,7 +1953,7 @@
    "referenced_type" : "type-282",
    "self_type" : "type-281",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1962,7 +1962,7 @@
    "referenced_type" : "type-289",
    "self_type" : "type-291",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1971,7 +1971,7 @@
    "referenced_type" : "type-298",
    "self_type" : "type-297",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1980,7 +1980,7 @@
    "referenced_type" : "type-308",
    "self_type" : "type-307",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1989,7 +1989,7 @@
    "referenced_type" : "type-316",
    "self_type" : "type-315",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1998,7 +1998,7 @@
    "referenced_type" : "type-324",
    "self_type" : "type-323",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2007,7 +2007,7 @@
    "referenced_type" : "type-327",
    "self_type" : "type-326",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2016,7 +2016,7 @@
    "referenced_type" : "type-43",
    "self_type" : "type-45",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2025,7 +2025,7 @@
    "referenced_type" : "type-46",
    "self_type" : "type-48",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2034,7 +2034,7 @@
    "referenced_type" : "type-60",
    "self_type" : "type-59",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2043,7 +2043,7 @@
    "referenced_type" : "type-79",
    "self_type" : "type-78",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2052,7 +2052,7 @@
    "referenced_type" : "type-87",
    "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2061,7 +2061,7 @@
    "referenced_type" : "type-98",
    "self_type" : "type-97",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   }
  ],
  "pointer_types" :
@@ -2073,7 +2073,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-69",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2082,7 +2082,7 @@
    "referenced_type" : "type-252",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2091,7 +2091,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-66",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2100,7 +2100,7 @@
    "referenced_type" : "type-269",
    "self_type" : "type-268",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2109,7 +2109,7 @@
    "referenced_type" : "type-82",
    "self_type" : "type-81",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2118,7 +2118,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-105",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2127,7 +2127,7 @@
    "referenced_type" : "type-117",
    "self_type" : "type-116",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2136,7 +2136,7 @@
    "referenced_type" : "type-128",
    "self_type" : "type-127",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2145,7 +2145,7 @@
    "referenced_type" : "type-148",
    "self_type" : "type-147",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2154,7 +2154,7 @@
    "referenced_type" : "type-171",
    "self_type" : "type-170",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2163,7 +2163,7 @@
    "referenced_type" : "type-19",
    "self_type" : "type-18",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2172,7 +2172,7 @@
    "referenced_type" : "type-202",
    "self_type" : "type-201",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2181,7 +2181,7 @@
    "referenced_type" : "type-211",
    "self_type" : "type-210",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2190,7 +2190,7 @@
    "referenced_type" : "type-242",
    "self_type" : "type-241",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2199,7 +2199,7 @@
    "referenced_type" : "type-274",
    "self_type" : "type-273",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2208,7 +2208,7 @@
    "referenced_type" : "type-285",
    "self_type" : "type-284",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2217,7 +2217,7 @@
    "referenced_type" : "type-293",
    "self_type" : "type-292",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2226,7 +2226,7 @@
    "referenced_type" : "type-301",
    "self_type" : "type-300",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2235,7 +2235,7 @@
    "referenced_type" : "type-311",
    "self_type" : "type-310",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2244,7 +2244,7 @@
    "referenced_type" : "type-319",
    "self_type" : "type-318",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2253,7 +2253,7 @@
    "referenced_type" : "type-330",
    "self_type" : "type-329",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2262,7 +2262,7 @@
    "referenced_type" : "type-335",
    "self_type" : "type-334",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2271,7 +2271,7 @@
    "referenced_type" : "type-53",
    "self_type" : "type-52",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2280,7 +2280,7 @@
    "referenced_type" : "type-91",
    "self_type" : "type-90",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2289,7 +2289,7 @@
    "referenced_type" : "type-147",
    "self_type" : "type-149",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2298,7 +2298,7 @@
    "referenced_type" : "type-201",
    "self_type" : "type-203",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2307,7 +2307,7 @@
    "referenced_type" : "type-334",
    "self_type" : "type-336",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2316,7 +2316,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-151",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2325,7 +2325,7 @@
    "referenced_type" : "type-9",
    "self_type" : "type-125",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2334,7 +2334,7 @@
    "referenced_type" : "type-73",
    "self_type" : "type-74",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2343,7 +2343,7 @@
    "referenced_type" : "type-255",
    "self_type" : "type-257",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2352,7 +2352,7 @@
    "referenced_type" : "type-278",
    "self_type" : "type-280",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2361,7 +2361,7 @@
    "referenced_type" : "type-70",
    "self_type" : "type-72",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2370,7 +2370,7 @@
    "referenced_type" : "type-95",
    "self_type" : "type-100",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2379,7 +2379,7 @@
    "referenced_type" : "type-152",
    "self_type" : "type-153",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2388,7 +2388,7 @@
    "referenced_type" : "type-12",
    "self_type" : "type-11",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2397,7 +2397,7 @@
    "referenced_type" : "type-11",
    "self_type" : "type-10",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2406,7 +2406,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-113",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2415,7 +2415,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-23",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2424,7 +2424,7 @@
    "referenced_type" : "type-49",
    "self_type" : "type-51",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "alignment" : 4,
@@ -2433,7 +2433,7 @@
    "referenced_type" : "type-133",
    "self_type" : "type-135",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2442,7 +2442,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-120",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2451,7 +2451,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-136",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2460,7 +2460,7 @@
    "referenced_type" : "type-186",
    "self_type" : "type-185",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2469,7 +2469,7 @@
    "referenced_type" : "type-228",
    "self_type" : "type-227",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2478,7 +2478,7 @@
    "referenced_type" : "type-38",
    "self_type" : "type-37",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2487,7 +2487,7 @@
    "referenced_type" : "type-34",
    "self_type" : "type-68",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2496,7 +2496,7 @@
    "referenced_type" : "type-188",
    "self_type" : "type-187",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2505,7 +2505,7 @@
    "referenced_type" : "type-230",
    "self_type" : "type-229",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2514,7 +2514,7 @@
    "referenced_type" : "type-42",
    "self_type" : "type-41",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2523,7 +2523,7 @@
    "referenced_type" : "type-2",
    "self_type" : "type-75",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2532,7 +2532,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-134",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "qualified_types" :
@@ -2543,7 +2543,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-8",
    "self_type" : "type-33",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2553,7 +2553,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-73",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "is_const" : true,
@@ -2561,7 +2561,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-256",
    "self_type" : "type-255",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2571,7 +2571,7 @@
    "referenced_type" : "type-279",
    "self_type" : "type-278",
    "size" : 116,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "is_const" : true,
@@ -2579,7 +2579,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-71",
    "self_type" : "type-70",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2589,7 +2589,7 @@
    "referenced_type" : "type-96",
    "self_type" : "type-95",
    "size" : 116,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2599,7 +2599,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-152",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2609,7 +2609,7 @@
    "referenced_type" : "type-9",
    "self_type" : "type-12",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2619,7 +2619,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-107",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -2629,7 +2629,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-16",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2639,7 +2639,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-108",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2649,7 +2649,7 @@
    "referenced_type" : "type-119",
    "self_type" : "type-118",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2659,7 +2659,7 @@
    "referenced_type" : "type-130",
    "self_type" : "type-129",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2669,7 +2669,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-155",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2679,7 +2679,7 @@
    "referenced_type" : "type-173",
    "self_type" : "type-172",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2689,7 +2689,7 @@
    "referenced_type" : "type-205",
    "self_type" : "type-204",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2699,7 +2699,7 @@
    "referenced_type" : "type-213",
    "self_type" : "type-212",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2709,7 +2709,7 @@
    "referenced_type" : "type-21",
    "self_type" : "type-20",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2719,7 +2719,7 @@
    "referenced_type" : "type-245",
    "self_type" : "type-244",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2729,7 +2729,7 @@
    "referenced_type" : "type-276",
    "self_type" : "type-275",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2739,7 +2739,7 @@
    "referenced_type" : "type-287",
    "self_type" : "type-286",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2749,7 +2749,7 @@
    "referenced_type" : "type-295",
    "self_type" : "type-294",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2759,7 +2759,7 @@
    "referenced_type" : "type-303",
    "self_type" : "type-302",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2769,7 +2769,7 @@
    "referenced_type" : "type-313",
    "self_type" : "type-312",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2779,7 +2779,7 @@
    "referenced_type" : "type-321",
    "self_type" : "type-320",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2789,7 +2789,7 @@
    "referenced_type" : "type-332",
    "self_type" : "type-331",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2799,7 +2799,7 @@
    "referenced_type" : "type-342",
    "self_type" : "type-341",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2809,7 +2809,7 @@
    "referenced_type" : "type-57",
    "self_type" : "type-56",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2819,7 +2819,7 @@
    "referenced_type" : "type-93",
    "self_type" : "type-92",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2829,7 +2829,7 @@
    "referenced_type" : "type-103",
    "self_type" : "type-102",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2839,7 +2839,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-111",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2849,7 +2849,7 @@
    "referenced_type" : "type-124",
    "self_type" : "type-123",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2859,7 +2859,7 @@
    "referenced_type" : "type-139",
    "self_type" : "type-138",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2869,7 +2869,7 @@
    "referenced_type" : "type-142",
    "self_type" : "type-141",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2879,7 +2879,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-14",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2889,7 +2889,7 @@
    "referenced_type" : "type-168",
    "self_type" : "type-167",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2899,7 +2899,7 @@
    "referenced_type" : "type-178",
    "self_type" : "type-177",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2909,7 +2909,7 @@
    "referenced_type" : "type-181",
    "self_type" : "type-180",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2919,7 +2919,7 @@
    "referenced_type" : "type-190",
    "self_type" : "type-189",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2929,7 +2929,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-193",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2939,7 +2939,7 @@
    "referenced_type" : "type-197",
    "self_type" : "type-196",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2949,7 +2949,7 @@
    "referenced_type" : "type-200",
    "self_type" : "type-199",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2959,7 +2959,7 @@
    "referenced_type" : "type-209",
    "self_type" : "type-208",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2969,7 +2969,7 @@
    "referenced_type" : "type-217",
    "self_type" : "type-216",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2979,7 +2979,7 @@
    "referenced_type" : "type-221",
    "self_type" : "type-220",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2989,7 +2989,7 @@
    "referenced_type" : "type-223",
    "self_type" : "type-222",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2999,7 +2999,7 @@
    "referenced_type" : "type-232",
    "self_type" : "type-231",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3009,7 +3009,7 @@
    "referenced_type" : "type-236",
    "self_type" : "type-235",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3019,7 +3019,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-248",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3029,7 +3029,7 @@
    "referenced_type" : "type-264",
    "self_type" : "type-263",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3039,7 +3039,7 @@
    "referenced_type" : "type-267",
    "self_type" : "type-266",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3049,7 +3049,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3059,7 +3059,7 @@
    "referenced_type" : "type-271",
    "self_type" : "type-270",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3069,7 +3069,7 @@
    "referenced_type" : "type-283",
    "self_type" : "type-282",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3079,7 +3079,7 @@
    "referenced_type" : "type-290",
    "self_type" : "type-289",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3089,7 +3089,7 @@
    "referenced_type" : "type-299",
    "self_type" : "type-298",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3099,7 +3099,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-28",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3109,7 +3109,7 @@
    "referenced_type" : "type-309",
    "self_type" : "type-308",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3119,7 +3119,7 @@
    "referenced_type" : "type-317",
    "self_type" : "type-316",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3129,7 +3129,7 @@
    "referenced_type" : "type-325",
    "self_type" : "type-324",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3139,7 +3139,7 @@
    "referenced_type" : "type-328",
    "self_type" : "type-327",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3149,7 +3149,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-43",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3159,7 +3159,7 @@
    "referenced_type" : "type-47",
    "self_type" : "type-46",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3169,7 +3169,7 @@
    "referenced_type" : "type-61",
    "self_type" : "type-60",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3179,7 +3179,7 @@
    "referenced_type" : "type-80",
    "self_type" : "type-79",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3189,7 +3189,7 @@
    "referenced_type" : "type-88",
    "self_type" : "type-87",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3199,7 +3199,7 @@
    "referenced_type" : "type-99",
    "self_type" : "type-98",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3209,7 +3209,7 @@
    "referenced_type" : "type-2",
    "self_type" : "type-131",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "is_const" : true,
@@ -3217,7 +3217,7 @@
    "name" : "const void",
    "referenced_type" : "type-50",
    "self_type" : "type-49",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   }
  ],
  "record_types" :
@@ -3281,7 +3281,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-65",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "unique_id" : "AndroidLogEntry_t"
   },
   {
@@ -3298,7 +3298,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-5",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_header_t"
   },
   {
@@ -3320,7 +3320,7 @@
    "referenced_type" : "type-160",
    "self_type" : "type-160",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_int_t"
   },
   {
@@ -3342,7 +3342,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-162",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_long_t"
   },
   {
@@ -3369,7 +3369,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-164",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_string_t"
   },
   {
@@ -3391,7 +3391,7 @@
    "referenced_type" : "type-161",
    "self_type" : "type-161",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_int_t"
   },
   {
@@ -3416,7 +3416,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-150",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
    "unique_id" : "_ZTS22android_log_event_list"
   },
   {
@@ -3438,7 +3438,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-163",
    "size" : 13,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_long_t"
   },
   {
@@ -3470,7 +3470,7 @@
    "referenced_type" : "type-4",
    "self_type" : "type-4",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_string_t"
   },
   {
@@ -3497,7 +3497,7 @@
    "referenced_type" : "type-159",
    "self_type" : "type-159",
    "size" : 11,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_header_t"
   },
   {
@@ -3529,7 +3529,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-143",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
    "unique_id" : "android_log_list_element"
   },
   {
@@ -3554,14 +3554,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3) at system/logging/liblog/include/log/log_event_list.h:53:3",
-   "name" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3) at system/logging/liblog/include/log/log_event_list.h:53:3",
+   "linker_set_key" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3) at system/core/liblog/include/log/log_event_list.h:53:3",
+   "name" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3) at system/core/liblog/include/log/log_event_list.h:53:3",
    "record_kind" : "union",
    "referenced_type" : "type-144",
    "self_type" : "type-144",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
-   "unique_id" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3)"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
+   "unique_id" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3)"
   },
   {
    "alignment" : 1,
@@ -3592,7 +3592,7 @@
    "referenced_type" : "type-158",
    "self_type" : "type-158",
    "size" : 7,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_pmsg_log_header_t"
   },
   {
@@ -3608,7 +3608,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-83",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -3641,14 +3641,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-84",
    "self_type" : "type-84",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -3669,7 +3669,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-17",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -3716,7 +3716,7 @@
    "referenced_type" : "type-34",
    "self_type" : "type-34",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -3768,7 +3768,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-54",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -3820,7 +3820,7 @@
    "referenced_type" : "type-62",
    "self_type" : "type-62",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -3877,7 +3877,7 @@
    "referenced_type" : "type-76",
    "self_type" : "type-76",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   }
  ],
diff --git a/29/64/x86/source-based/libmediandk.so.lsdump b/29/64/x86/source-based/libmediandk.so.lsdump
index 7039f59..6553a35 100644
--- a/29/64/x86/source-based/libmediandk.so.lsdump
+++ b/29/64/x86/source-based/libmediandk.so.lsdump
@@ -203,7 +203,7 @@
    "name" : "char []",
    "referenced_type" : "type-42",
    "self_type" : "type-2719",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -308,7 +308,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-2790",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -2036,7 +2036,7 @@
    "referenced_type" : "type-2851",
    "self_type" : "type-2851",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "AndroidEventLogType"
   },
@@ -4747,7 +4747,7 @@
    "referenced_type" : "type-2569",
    "self_type" : "type-2569",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "android_LogPriority"
   },
@@ -7229,7 +7229,7 @@
    "referenced_type" : "type-2603",
    "self_type" : "type-2603",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "log_id"
   },
@@ -13444,7 +13444,7 @@
    "referenced_type" : "type-2807",
    "self_type" : "type-2831",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -13453,7 +13453,7 @@
    "referenced_type" : "type-2689",
    "self_type" : "type-2708",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13561,7 +13561,7 @@
    "referenced_type" : "type-1065",
    "self_type" : "type-1067",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13570,7 +13570,7 @@
    "referenced_type" : "type-1359",
    "self_type" : "type-1361",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13579,7 +13579,7 @@
    "referenced_type" : "type-1469",
    "self_type" : "type-1471",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13588,7 +13588,7 @@
    "referenced_type" : "type-1492",
    "self_type" : "type-1495",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13597,7 +13597,7 @@
    "referenced_type" : "type-1637",
    "self_type" : "type-1646",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13606,7 +13606,7 @@
    "referenced_type" : "type-1680",
    "self_type" : "type-1688",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13615,7 +13615,7 @@
    "referenced_type" : "type-1731",
    "self_type" : "type-1733",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13624,7 +13624,7 @@
    "referenced_type" : "type-1779",
    "self_type" : "type-1781",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13633,7 +13633,7 @@
    "referenced_type" : "type-1868",
    "self_type" : "type-1867",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13642,7 +13642,7 @@
    "referenced_type" : "type-2300",
    "self_type" : "type-2299",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13651,7 +13651,7 @@
    "referenced_type" : "type-2655",
    "self_type" : "type-2680",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13660,7 +13660,7 @@
    "referenced_type" : "type-387",
    "self_type" : "type-389",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13669,7 +13669,7 @@
    "referenced_type" : "type-455",
    "self_type" : "type-457",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13678,7 +13678,7 @@
    "referenced_type" : "type-793",
    "self_type" : "type-799",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13687,7 +13687,7 @@
    "referenced_type" : "type-886",
    "self_type" : "type-890",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13696,7 +13696,7 @@
    "referenced_type" : "type-949",
    "self_type" : "type-951",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20125,7 +20125,7 @@
    "referenced_type" : "type-2807",
    "self_type" : "type-2830",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20134,7 +20134,7 @@
    "referenced_type" : "type-2689",
    "self_type" : "type-2698",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20638,7 +20638,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2841",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20647,7 +20647,7 @@
    "referenced_type" : "type-2630",
    "self_type" : "type-2669",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21264,7 +21264,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-2719",
    "self_type" : "type-2735",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -23844,7 +23844,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2807",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -23854,7 +23854,7 @@
    "referenced_type" : "type-2630",
    "self_type" : "type-2689",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25424,7 +25424,7 @@
    "referenced_type" : "type-1066",
    "self_type" : "type-1065",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25434,7 +25434,7 @@
    "referenced_type" : "type-1360",
    "self_type" : "type-1359",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25444,7 +25444,7 @@
    "referenced_type" : "type-1470",
    "self_type" : "type-1469",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25454,7 +25454,7 @@
    "referenced_type" : "type-1493",
    "self_type" : "type-1492",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25464,7 +25464,7 @@
    "referenced_type" : "type-1638",
    "self_type" : "type-1637",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25474,7 +25474,7 @@
    "referenced_type" : "type-1681",
    "self_type" : "type-1680",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25484,7 +25484,7 @@
    "referenced_type" : "type-1732",
    "self_type" : "type-1731",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25494,7 +25494,7 @@
    "referenced_type" : "type-1780",
    "self_type" : "type-1779",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25504,7 +25504,7 @@
    "referenced_type" : "type-1869",
    "self_type" : "type-1868",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25514,7 +25514,7 @@
    "referenced_type" : "type-2301",
    "self_type" : "type-2300",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25524,7 +25524,7 @@
    "referenced_type" : "type-2656",
    "self_type" : "type-2655",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25534,7 +25534,7 @@
    "referenced_type" : "type-388",
    "self_type" : "type-387",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25544,7 +25544,7 @@
    "referenced_type" : "type-456",
    "self_type" : "type-455",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25554,7 +25554,7 @@
    "referenced_type" : "type-794",
    "self_type" : "type-793",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25564,7 +25564,7 @@
    "referenced_type" : "type-887",
    "self_type" : "type-886",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25574,7 +25574,7 @@
    "referenced_type" : "type-950",
    "self_type" : "type-949",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -25594,7 +25594,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-195",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -49210,7 +49210,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2788",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -49243,14 +49243,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2789",
    "self_type" : "type-2789",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -49271,7 +49271,7 @@
    "referenced_type" : "type-2630",
    "self_type" : "type-2630",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -49318,7 +49318,7 @@
    "referenced_type" : "type-2742",
    "self_type" : "type-2742",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -49370,7 +49370,7 @@
    "referenced_type" : "type-2763",
    "self_type" : "type-2763",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -49422,7 +49422,7 @@
    "referenced_type" : "type-2775",
    "self_type" : "type-2775",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -49479,7 +49479,7 @@
    "referenced_type" : "type-2778",
    "self_type" : "type-2778",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/x86/source-based/libstdc++.so.lsdump b/29/64/x86/source-based/libstdc++.so.lsdump
index 739ceb0..8694323 100644
--- a/29/64/x86/source-based/libstdc++.so.lsdump
+++ b/29/64/x86/source-based/libstdc++.so.lsdump
@@ -495,7 +495,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-106",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-7",
    "unique_id" : "android_LogPriority"
   },
@@ -549,7 +549,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-107",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-7",
    "unique_id" : "log_id"
   },
diff --git a/29/64/x86_64/source-based/libOpenMAXAL.so.lsdump b/29/64/x86_64/source-based/libOpenMAXAL.so.lsdump
index d58811c..5d6d504 100644
--- a/29/64/x86_64/source-based/libOpenMAXAL.so.lsdump
+++ b/29/64/x86_64/source-based/libOpenMAXAL.so.lsdump
@@ -105,7 +105,7 @@
    "name" : "char []",
    "referenced_type" : "type-145",
    "self_type" : "type-816",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -218,7 +218,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-2597",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1017,7 +1017,7 @@
    "referenced_type" : "type-2615",
    "self_type" : "type-2615",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -2554,7 +2554,7 @@
    "referenced_type" : "type-2576",
    "self_type" : "type-2576",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -5028,7 +5028,7 @@
    "referenced_type" : "type-2577",
    "self_type" : "type-2577",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -15893,7 +15893,7 @@
    "referenced_type" : "type-2611",
    "self_type" : "type-2613",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -15902,7 +15902,7 @@
    "referenced_type" : "type-2583",
    "self_type" : "type-2585",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -16010,7 +16010,7 @@
    "referenced_type" : "type-2176",
    "self_type" : "type-2178",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -16019,7 +16019,7 @@
    "referenced_type" : "type-2361",
    "self_type" : "type-2360",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -16028,7 +16028,7 @@
    "referenced_type" : "type-2579",
    "self_type" : "type-2582",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -18056,7 +18056,7 @@
    "referenced_type" : "type-145",
    "self_type" : "type-364",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20531,7 +20531,7 @@
    "referenced_type" : "type-165",
    "self_type" : "type-164",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -20576,7 +20576,7 @@
    "referenced_type" : "type-2611",
    "self_type" : "type-2612",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20585,7 +20585,7 @@
    "referenced_type" : "type-2583",
    "self_type" : "type-2584",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -20828,7 +20828,7 @@
    "referenced_type" : "type-2595",
    "self_type" : "type-2614",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20837,7 +20837,7 @@
    "referenced_type" : "type-2578",
    "self_type" : "type-2581",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25108,7 +25108,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-816",
    "self_type" : "type-2586",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -27994,7 +27994,7 @@
    "referenced_type" : "type-145",
    "self_type" : "type-165",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28064,7 +28064,7 @@
    "referenced_type" : "type-2595",
    "self_type" : "type-2611",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28074,7 +28074,7 @@
    "referenced_type" : "type-2578",
    "self_type" : "type-2583",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28204,7 +28204,7 @@
    "referenced_type" : "type-2177",
    "self_type" : "type-2176",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28214,7 +28214,7 @@
    "referenced_type" : "type-2362",
    "self_type" : "type-2361",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28224,7 +28224,7 @@
    "referenced_type" : "type-2580",
    "self_type" : "type-2579",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -60171,7 +60171,7 @@
    "referenced_type" : "type-2595",
    "self_type" : "type-2595",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -60204,14 +60204,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2596",
    "self_type" : "type-2596",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -60232,7 +60232,7 @@
    "referenced_type" : "type-2578",
    "self_type" : "type-2578",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -60279,7 +60279,7 @@
    "referenced_type" : "type-2587",
    "self_type" : "type-2587",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -60331,7 +60331,7 @@
    "referenced_type" : "type-2589",
    "self_type" : "type-2589",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -60383,7 +60383,7 @@
    "referenced_type" : "type-2591",
    "self_type" : "type-2591",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -60440,7 +60440,7 @@
    "referenced_type" : "type-2593",
    "self_type" : "type-2593",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/x86_64/source-based/libOpenSLES.so.lsdump b/29/64/x86_64/source-based/libOpenSLES.so.lsdump
index 23d99cf..5782e09 100644
--- a/29/64/x86_64/source-based/libOpenSLES.so.lsdump
+++ b/29/64/x86_64/source-based/libOpenSLES.so.lsdump
@@ -105,7 +105,7 @@
    "name" : "char []",
    "referenced_type" : "type-145",
    "self_type" : "type-816",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -218,7 +218,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-2597",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1053,7 +1053,7 @@
    "referenced_type" : "type-2615",
    "self_type" : "type-2615",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -2590,7 +2590,7 @@
    "referenced_type" : "type-2576",
    "self_type" : "type-2576",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -5064,7 +5064,7 @@
    "referenced_type" : "type-2577",
    "self_type" : "type-2577",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -16001,7 +16001,7 @@
    "referenced_type" : "type-2611",
    "self_type" : "type-2613",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -16010,7 +16010,7 @@
    "referenced_type" : "type-2583",
    "self_type" : "type-2585",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -16118,7 +16118,7 @@
    "referenced_type" : "type-2176",
    "self_type" : "type-2178",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -16127,7 +16127,7 @@
    "referenced_type" : "type-2361",
    "self_type" : "type-2360",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -16136,7 +16136,7 @@
    "referenced_type" : "type-2579",
    "self_type" : "type-2582",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -18164,7 +18164,7 @@
    "referenced_type" : "type-145",
    "self_type" : "type-364",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20639,7 +20639,7 @@
    "referenced_type" : "type-165",
    "self_type" : "type-164",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -20684,7 +20684,7 @@
    "referenced_type" : "type-2611",
    "self_type" : "type-2612",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20693,7 +20693,7 @@
    "referenced_type" : "type-2583",
    "self_type" : "type-2584",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -20936,7 +20936,7 @@
    "referenced_type" : "type-2595",
    "self_type" : "type-2614",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20945,7 +20945,7 @@
    "referenced_type" : "type-2578",
    "self_type" : "type-2581",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25216,7 +25216,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-816",
    "self_type" : "type-2586",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28102,7 +28102,7 @@
    "referenced_type" : "type-145",
    "self_type" : "type-165",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28172,7 +28172,7 @@
    "referenced_type" : "type-2595",
    "self_type" : "type-2611",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28182,7 +28182,7 @@
    "referenced_type" : "type-2578",
    "self_type" : "type-2583",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28312,7 +28312,7 @@
    "referenced_type" : "type-2177",
    "self_type" : "type-2176",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28322,7 +28322,7 @@
    "referenced_type" : "type-2362",
    "self_type" : "type-2361",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -28332,7 +28332,7 @@
    "referenced_type" : "type-2580",
    "self_type" : "type-2579",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -60279,7 +60279,7 @@
    "referenced_type" : "type-2595",
    "self_type" : "type-2595",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -60312,14 +60312,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2596",
    "self_type" : "type-2596",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -60340,7 +60340,7 @@
    "referenced_type" : "type-2578",
    "self_type" : "type-2578",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -60387,7 +60387,7 @@
    "referenced_type" : "type-2587",
    "self_type" : "type-2587",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -60439,7 +60439,7 @@
    "referenced_type" : "type-2589",
    "self_type" : "type-2589",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -60491,7 +60491,7 @@
    "referenced_type" : "type-2591",
    "self_type" : "type-2591",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -60548,7 +60548,7 @@
    "referenced_type" : "type-2593",
    "self_type" : "type-2593",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/x86_64/source-based/libRS.so.lsdump b/29/64/x86_64/source-based/libRS.so.lsdump
index 3477527..62e8e78 100644
--- a/29/64/x86_64/source-based/libRS.so.lsdump
+++ b/29/64/x86_64/source-based/libRS.so.lsdump
@@ -409,7 +409,7 @@
    "name" : "char []",
    "referenced_type" : "type-5",
    "self_type" : "type-4296",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 2,
@@ -624,7 +624,7 @@
    "referenced_type" : "type-21",
    "self_type" : "type-4308",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1395,7 +1395,7 @@
    "referenced_type" : "type-4315",
    "self_type" : "type-4315",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "AndroidEventLogType"
   },
@@ -4285,7 +4285,7 @@
    "referenced_type" : "type-4274",
    "self_type" : "type-4274",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "android_LogPriority"
   },
@@ -4419,7 +4419,7 @@
    "referenced_type" : "type-4275",
    "self_type" : "type-4275",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "log_id"
   },
@@ -16382,7 +16382,7 @@
    "referenced_type" : "type-4309",
    "self_type" : "type-4311",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -16391,7 +16391,7 @@
    "referenced_type" : "type-4293",
    "self_type" : "type-4295",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -17372,7 +17372,7 @@
    "referenced_type" : "type-4287",
    "self_type" : "type-4292",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -17381,7 +17381,7 @@
    "referenced_type" : "type-7135",
    "self_type" : "type-7137",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "linker_set_key" : "const uniform_int_distribution<_IntType> &",
@@ -20008,7 +20008,7 @@
    "referenced_type" : "type-4309",
    "self_type" : "type-4310",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20017,7 +20017,7 @@
    "referenced_type" : "type-4293",
    "self_type" : "type-4294",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -22006,7 +22006,7 @@
    "referenced_type" : "type-4306",
    "self_type" : "type-4312",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -22015,7 +22015,7 @@
    "referenced_type" : "type-4286",
    "self_type" : "type-4288",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -26554,7 +26554,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-4296",
    "self_type" : "type-4297",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -27316,7 +27316,7 @@
    "referenced_type" : "type-4306",
    "self_type" : "type-4309",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -27326,7 +27326,7 @@
    "referenced_type" : "type-4286",
    "self_type" : "type-4293",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -29562,7 +29562,7 @@
    "referenced_type" : "type-2638",
    "self_type" : "type-4287",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -29572,7 +29572,7 @@
    "referenced_type" : "type-7128",
    "self_type" : "type-7135",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -37116,7 +37116,7 @@
    "referenced_type" : "type-4306",
    "self_type" : "type-4306",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -37149,14 +37149,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-4307",
    "self_type" : "type-4307",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -37177,7 +37177,7 @@
    "referenced_type" : "type-4286",
    "self_type" : "type-4286",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -37224,7 +37224,7 @@
    "referenced_type" : "type-4298",
    "self_type" : "type-4298",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -37276,7 +37276,7 @@
    "referenced_type" : "type-4300",
    "self_type" : "type-4300",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -37328,7 +37328,7 @@
    "referenced_type" : "type-4302",
    "self_type" : "type-4302",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -37385,7 +37385,7 @@
    "referenced_type" : "type-4304",
    "self_type" : "type-4304",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/x86_64/source-based/liblog.so.lsdump b/29/64/x86_64/source-based/liblog.so.lsdump
index fabb172..a543e56 100644
--- a/29/64/x86_64/source-based/liblog.so.lsdump
+++ b/29/64/x86_64/source-based/liblog.so.lsdump
@@ -6,7 +6,7 @@
    "name" : "char []",
    "referenced_type" : "type-9",
    "self_type" : "type-8",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -15,7 +15,7 @@
    "referenced_type" : "type-87",
    "self_type" : "type-86",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   }
  ],
  "builtin_types" :
@@ -333,7 +333,7 @@
    "referenced_type" : "type-127",
    "self_type" : "type-127",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -423,7 +423,7 @@
    "referenced_type" : "type-64",
    "self_type" : "type-64",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidLogPrintFormat"
   },
@@ -473,7 +473,7 @@
    "referenced_type" : "type-1",
    "self_type" : "type-1",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -527,7 +527,7 @@
    "referenced_type" : "type-105",
    "self_type" : "type-105",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -581,7 +581,7 @@
    "referenced_type" : "type-32",
    "self_type" : "type-32",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_id.h",
+   "source_file" : "/system/core/liblog/include/log/log_id.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   }
@@ -616,7 +616,7 @@
    "referenced_type" : "type-134",
    "return_type" : "type-66",
    "self_type" : "type-134",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "functions" :
@@ -637,7 +637,7 @@
     }
    ],
    "return_type" : "type-48",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bswrite",
@@ -652,7 +652,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_btwrite",
@@ -673,7 +673,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_buf_print",
@@ -694,7 +694,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_buf_write",
@@ -715,7 +715,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bwrite",
@@ -733,13 +733,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_close",
    "linker_set_key" : "__android_log_close",
    "return_type" : "type-48",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_error_write",
@@ -763,13 +763,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_safetynet.h"
+   "source_file" : "/system/core/liblog/include/log/log_safetynet.h"
   },
   {
    "function_name" : "__android_log_is_debuggable",
    "linker_set_key" : "__android_log_is_debuggable",
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_properties.h"
+   "source_file" : "/system/core/liblog/include/log/log_properties.h"
   },
   {
    "function_name" : "__android_log_is_loggable",
@@ -787,7 +787,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_main.h"
+   "source_file" : "/system/core/liblog/include/log/log_main.h"
   },
   {
    "function_name" : "__android_log_is_loggable_len",
@@ -808,7 +808,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_main.h"
+   "source_file" : "/system/core/liblog/include/log/log_main.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_read",
@@ -832,7 +832,7 @@
     }
    ],
    "return_type" : "type-66",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_write",
@@ -856,7 +856,7 @@
     }
    ],
    "return_type" : "type-66",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_print",
@@ -874,13 +874,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_security",
    "linker_set_key" : "__android_log_security",
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_security_bswrite",
@@ -895,7 +895,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_vprint",
@@ -916,7 +916,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write",
@@ -934,7 +934,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_logger_get_buffer_size",
@@ -946,7 +946,7 @@
     }
    ],
    "return_type" : "type-30",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_logger_property_get_bool",
@@ -961,7 +961,7 @@
     }
    ],
    "return_type" : "type-3",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_destroy",
@@ -973,7 +973,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_id_to_name",
@@ -985,7 +985,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_log_parser_reset",
@@ -1003,7 +1003,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_processBinaryLogBuffer",
@@ -1027,7 +1027,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_processLogBuffer",
@@ -1042,7 +1042,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_read_next",
@@ -1054,7 +1054,7 @@
     }
    ],
    "return_type" : "type-144",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_reset",
@@ -1066,7 +1066,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_float32",
@@ -1081,7 +1081,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int32",
@@ -1096,7 +1096,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int64",
@@ -1111,7 +1111,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list",
@@ -1126,7 +1126,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_begin",
@@ -1138,7 +1138,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_buffer",
@@ -1153,7 +1153,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_write_list_end",
@@ -1165,7 +1165,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8",
@@ -1180,7 +1180,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8_len",
@@ -1198,7 +1198,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_logger_clear",
@@ -1210,7 +1210,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_id",
@@ -1222,7 +1222,7 @@
     }
    ],
    "return_type" : "type-32",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_readable_size",
@@ -1234,7 +1234,7 @@
     }
    ],
    "return_type" : "type-66",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_size",
@@ -1246,7 +1246,7 @@
     }
    ],
    "return_type" : "type-66",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_version",
@@ -1258,7 +1258,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_prune_list",
@@ -1276,7 +1276,7 @@
     }
    ],
    "return_type" : "type-66",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_statistics",
@@ -1294,7 +1294,7 @@
     }
    ],
    "return_type" : "type-66",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc",
@@ -1312,7 +1312,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc_time",
@@ -1330,7 +1330,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_free",
@@ -1342,7 +1342,7 @@
     }
    ],
    "return_type" : "type-48",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_open",
@@ -1363,7 +1363,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_read",
@@ -1378,7 +1378,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_open",
@@ -1393,7 +1393,7 @@
     }
    ],
    "return_type" : "type-37",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_log_size",
@@ -1408,7 +1408,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_prune_list",
@@ -1426,7 +1426,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_lookupEventTagNum",
@@ -1447,7 +1447,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "android_name_to_log_id",
@@ -1459,7 +1459,7 @@
     }
    ],
    "return_type" : "type-105",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_openEventTagMap",
@@ -1471,7 +1471,7 @@
     }
    ],
    "return_type" : "type-82",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "create_android_log_parser",
@@ -1486,7 +1486,7 @@
     }
    ],
    "return_type" : "type-147",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "create_android_logger",
@@ -1498,7 +1498,7 @@
     }
    ],
    "return_type" : "type-147",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "global_vars" : [],
@@ -1511,7 +1511,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-154",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1520,7 +1520,7 @@
    "referenced_type" : "type-108",
    "self_type" : "type-116",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -1529,7 +1529,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-27",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1538,7 +1538,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-111",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1547,7 +1547,7 @@
    "referenced_type" : "type-120",
    "self_type" : "type-122",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1556,7 +1556,7 @@
    "referenced_type" : "type-130",
    "self_type" : "type-133",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1565,7 +1565,7 @@
    "referenced_type" : "type-155",
    "self_type" : "type-157",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1574,7 +1574,7 @@
    "referenced_type" : "type-172",
    "self_type" : "type-174",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1583,7 +1583,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-22",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1592,7 +1592,7 @@
    "referenced_type" : "type-204",
    "self_type" : "type-206",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1601,7 +1601,7 @@
    "referenced_type" : "type-212",
    "self_type" : "type-214",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1610,7 +1610,7 @@
    "referenced_type" : "type-244",
    "self_type" : "type-246",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1619,7 +1619,7 @@
    "referenced_type" : "type-277",
    "self_type" : "type-279",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1628,7 +1628,7 @@
    "referenced_type" : "type-288",
    "self_type" : "type-290",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1637,7 +1637,7 @@
    "referenced_type" : "type-296",
    "self_type" : "type-298",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1646,7 +1646,7 @@
    "referenced_type" : "type-304",
    "self_type" : "type-306",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1655,7 +1655,7 @@
    "referenced_type" : "type-314",
    "self_type" : "type-316",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1664,7 +1664,7 @@
    "referenced_type" : "type-322",
    "self_type" : "type-324",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1673,7 +1673,7 @@
    "referenced_type" : "type-333",
    "self_type" : "type-335",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1682,7 +1682,7 @@
    "referenced_type" : "type-343",
    "self_type" : "type-345",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1691,7 +1691,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-56",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1700,7 +1700,7 @@
    "referenced_type" : "type-93",
    "self_type" : "type-95",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1709,7 +1709,7 @@
    "referenced_type" : "type-103",
    "self_type" : "type-102",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1718,7 +1718,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-115",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1727,7 +1727,7 @@
    "referenced_type" : "type-124",
    "self_type" : "type-123",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1736,7 +1736,7 @@
    "referenced_type" : "type-139",
    "self_type" : "type-138",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1745,7 +1745,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1754,7 +1754,7 @@
    "referenced_type" : "type-142",
    "self_type" : "type-141",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1763,7 +1763,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-166",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1772,7 +1772,7 @@
    "referenced_type" : "type-177",
    "self_type" : "type-176",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1781,7 +1781,7 @@
    "referenced_type" : "type-180",
    "self_type" : "type-182",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1790,7 +1790,7 @@
    "referenced_type" : "type-189",
    "self_type" : "type-191",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1799,7 +1799,7 @@
    "referenced_type" : "type-193",
    "self_type" : "type-192",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1808,7 +1808,7 @@
    "referenced_type" : "type-196",
    "self_type" : "type-195",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1817,7 +1817,7 @@
    "referenced_type" : "type-199",
    "self_type" : "type-198",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1826,7 +1826,7 @@
    "referenced_type" : "type-208",
    "self_type" : "type-207",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1835,7 +1835,7 @@
    "referenced_type" : "type-216",
    "self_type" : "type-215",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1844,7 +1844,7 @@
    "referenced_type" : "type-219",
    "self_type" : "type-224",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1853,7 +1853,7 @@
    "referenced_type" : "type-222",
    "self_type" : "type-221",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1862,7 +1862,7 @@
    "referenced_type" : "type-231",
    "self_type" : "type-233",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1871,7 +1871,7 @@
    "referenced_type" : "type-235",
    "self_type" : "type-237",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1880,7 +1880,7 @@
    "referenced_type" : "type-25",
    "self_type" : "type-24",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1889,7 +1889,7 @@
    "referenced_type" : "type-250",
    "self_type" : "type-249",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1898,7 +1898,7 @@
    "referenced_type" : "type-265",
    "self_type" : "type-264",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1907,7 +1907,7 @@
    "referenced_type" : "type-268",
    "self_type" : "type-267",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1916,7 +1916,7 @@
    "referenced_type" : "type-272",
    "self_type" : "type-274",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1925,7 +1925,7 @@
    "referenced_type" : "type-28",
    "self_type" : "type-31",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1934,7 +1934,7 @@
    "referenced_type" : "type-284",
    "self_type" : "type-283",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1943,7 +1943,7 @@
    "referenced_type" : "type-291",
    "self_type" : "type-293",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1952,7 +1952,7 @@
    "referenced_type" : "type-300",
    "self_type" : "type-299",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1961,7 +1961,7 @@
    "referenced_type" : "type-310",
    "self_type" : "type-309",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1970,7 +1970,7 @@
    "referenced_type" : "type-318",
    "self_type" : "type-317",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1979,7 +1979,7 @@
    "referenced_type" : "type-326",
    "self_type" : "type-325",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1988,7 +1988,7 @@
    "referenced_type" : "type-329",
    "self_type" : "type-328",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -1997,7 +1997,7 @@
    "referenced_type" : "type-41",
    "self_type" : "type-43",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2006,7 +2006,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-46",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2015,7 +2015,7 @@
    "referenced_type" : "type-60",
    "self_type" : "type-59",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2024,7 +2024,7 @@
    "referenced_type" : "type-80",
    "self_type" : "type-79",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2033,7 +2033,7 @@
    "referenced_type" : "type-88",
    "self_type" : "type-90",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2042,7 +2042,7 @@
    "referenced_type" : "type-99",
    "self_type" : "type-98",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   }
  ],
  "pointer_types" :
@@ -2054,7 +2054,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-70",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2063,7 +2063,7 @@
    "referenced_type" : "type-254",
    "self_type" : "type-253",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2072,7 +2072,7 @@
    "referenced_type" : "type-68",
    "self_type" : "type-67",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2081,7 +2081,7 @@
    "referenced_type" : "type-271",
    "self_type" : "type-270",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 8,
@@ -2090,7 +2090,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-82",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 8,
@@ -2099,7 +2099,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-247",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 8,
@@ -2108,7 +2108,7 @@
    "referenced_type" : "type-58",
    "self_type" : "type-57",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 8,
@@ -2117,7 +2117,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-106",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2126,7 +2126,7 @@
    "referenced_type" : "type-118",
    "self_type" : "type-117",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2135,7 +2135,7 @@
    "referenced_type" : "type-129",
    "self_type" : "type-128",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2144,7 +2144,7 @@
    "referenced_type" : "type-148",
    "self_type" : "type-147",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2153,7 +2153,7 @@
    "referenced_type" : "type-171",
    "self_type" : "type-170",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2162,7 +2162,7 @@
    "referenced_type" : "type-19",
    "self_type" : "type-18",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2171,7 +2171,7 @@
    "referenced_type" : "type-202",
    "self_type" : "type-201",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2180,7 +2180,7 @@
    "referenced_type" : "type-211",
    "self_type" : "type-210",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2189,7 +2189,7 @@
    "referenced_type" : "type-242",
    "self_type" : "type-241",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2198,7 +2198,7 @@
    "referenced_type" : "type-276",
    "self_type" : "type-275",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2207,7 +2207,7 @@
    "referenced_type" : "type-287",
    "self_type" : "type-286",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2216,7 +2216,7 @@
    "referenced_type" : "type-295",
    "self_type" : "type-294",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2225,7 +2225,7 @@
    "referenced_type" : "type-303",
    "self_type" : "type-302",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2234,7 +2234,7 @@
    "referenced_type" : "type-313",
    "self_type" : "type-312",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2243,7 +2243,7 @@
    "referenced_type" : "type-321",
    "self_type" : "type-320",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2252,7 +2252,7 @@
    "referenced_type" : "type-332",
    "self_type" : "type-331",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2261,7 +2261,7 @@
    "referenced_type" : "type-337",
    "self_type" : "type-336",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2270,7 +2270,7 @@
    "referenced_type" : "type-51",
    "self_type" : "type-50",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2279,7 +2279,7 @@
    "referenced_type" : "type-92",
    "self_type" : "type-91",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2288,7 +2288,7 @@
    "referenced_type" : "type-147",
    "self_type" : "type-149",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2297,7 +2297,7 @@
    "referenced_type" : "type-201",
    "self_type" : "type-203",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2306,7 +2306,7 @@
    "referenced_type" : "type-336",
    "self_type" : "type-338",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2315,7 +2315,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-151",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2324,7 +2324,7 @@
    "referenced_type" : "type-9",
    "self_type" : "type-126",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2333,7 +2333,7 @@
    "referenced_type" : "type-74",
    "self_type" : "type-75",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2342,7 +2342,7 @@
    "referenced_type" : "type-257",
    "self_type" : "type-259",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2351,7 +2351,7 @@
    "referenced_type" : "type-280",
    "self_type" : "type-282",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 8,
@@ -2360,7 +2360,7 @@
    "referenced_type" : "type-71",
    "self_type" : "type-73",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2369,7 +2369,7 @@
    "referenced_type" : "type-96",
    "self_type" : "type-101",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 8,
@@ -2378,7 +2378,7 @@
    "referenced_type" : "type-152",
    "self_type" : "type-153",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2387,7 +2387,7 @@
    "referenced_type" : "type-12",
    "self_type" : "type-11",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2396,7 +2396,7 @@
    "referenced_type" : "type-11",
    "self_type" : "type-10",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -2405,7 +2405,7 @@
    "referenced_type" : "type-108",
    "self_type" : "type-114",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2414,7 +2414,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-23",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2423,7 +2423,7 @@
    "referenced_type" : "type-47",
    "self_type" : "type-49",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "alignment" : 8,
@@ -2432,7 +2432,7 @@
    "referenced_type" : "type-84",
    "self_type" : "type-119",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2441,7 +2441,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-137",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2450,7 +2450,7 @@
    "referenced_type" : "type-186",
    "self_type" : "type-185",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2459,7 +2459,7 @@
    "referenced_type" : "type-228",
    "self_type" : "type-227",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2468,7 +2468,7 @@
    "referenced_type" : "type-38",
    "self_type" : "type-37",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2477,7 +2477,7 @@
    "referenced_type" : "type-34",
    "self_type" : "type-69",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2486,7 +2486,7 @@
    "referenced_type" : "type-188",
    "self_type" : "type-187",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2495,7 +2495,7 @@
    "referenced_type" : "type-230",
    "self_type" : "type-229",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2504,7 +2504,7 @@
    "referenced_type" : "type-40",
    "self_type" : "type-39",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -2513,7 +2513,7 @@
    "referenced_type" : "type-134",
    "self_type" : "type-136",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -2522,7 +2522,7 @@
    "referenced_type" : "type-30",
    "self_type" : "type-76",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2531,7 +2531,7 @@
    "referenced_type" : "type-48",
    "self_type" : "type-135",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "qualified_types" :
@@ -2542,7 +2542,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-8",
    "self_type" : "type-33",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2552,7 +2552,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-74",
    "size" : 64,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "is_const" : true,
@@ -2560,7 +2560,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-258",
    "self_type" : "type-257",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2570,7 +2570,7 @@
    "referenced_type" : "type-281",
    "self_type" : "type-280",
    "size" : 208,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "is_const" : true,
@@ -2578,7 +2578,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-72",
    "self_type" : "type-71",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -2588,7 +2588,7 @@
    "referenced_type" : "type-97",
    "self_type" : "type-96",
    "size" : 208,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 8,
@@ -2598,7 +2598,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-152",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2608,7 +2608,7 @@
    "referenced_type" : "type-9",
    "self_type" : "type-12",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2618,7 +2618,7 @@
    "referenced_type" : "type-84",
    "self_type" : "type-108",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -2628,7 +2628,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-16",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2638,7 +2638,7 @@
    "referenced_type" : "type-110",
    "self_type" : "type-109",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2648,7 +2648,7 @@
    "referenced_type" : "type-121",
    "self_type" : "type-120",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2658,7 +2658,7 @@
    "referenced_type" : "type-131",
    "self_type" : "type-130",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2668,7 +2668,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-155",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2678,7 +2678,7 @@
    "referenced_type" : "type-173",
    "self_type" : "type-172",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2688,7 +2688,7 @@
    "referenced_type" : "type-205",
    "self_type" : "type-204",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2698,7 +2698,7 @@
    "referenced_type" : "type-213",
    "self_type" : "type-212",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2708,7 +2708,7 @@
    "referenced_type" : "type-21",
    "self_type" : "type-20",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2718,7 +2718,7 @@
    "referenced_type" : "type-245",
    "self_type" : "type-244",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2728,7 +2728,7 @@
    "referenced_type" : "type-278",
    "self_type" : "type-277",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2738,7 +2738,7 @@
    "referenced_type" : "type-289",
    "self_type" : "type-288",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2748,7 +2748,7 @@
    "referenced_type" : "type-297",
    "self_type" : "type-296",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2758,7 +2758,7 @@
    "referenced_type" : "type-305",
    "self_type" : "type-304",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2768,7 +2768,7 @@
    "referenced_type" : "type-315",
    "self_type" : "type-314",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2778,7 +2778,7 @@
    "referenced_type" : "type-323",
    "self_type" : "type-322",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2788,7 +2788,7 @@
    "referenced_type" : "type-334",
    "self_type" : "type-333",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2798,7 +2798,7 @@
    "referenced_type" : "type-344",
    "self_type" : "type-343",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2808,7 +2808,7 @@
    "referenced_type" : "type-55",
    "self_type" : "type-54",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2818,7 +2818,7 @@
    "referenced_type" : "type-94",
    "self_type" : "type-93",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -2828,7 +2828,7 @@
    "referenced_type" : "type-100",
    "self_type" : "type-99",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2838,7 +2838,7 @@
    "referenced_type" : "type-104",
    "self_type" : "type-103",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2848,7 +2848,7 @@
    "referenced_type" : "type-113",
    "self_type" : "type-112",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2858,7 +2858,7 @@
    "referenced_type" : "type-125",
    "self_type" : "type-124",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2868,7 +2868,7 @@
    "referenced_type" : "type-140",
    "self_type" : "type-139",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2878,7 +2878,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-142",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2888,7 +2888,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-14",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2898,7 +2898,7 @@
    "referenced_type" : "type-168",
    "self_type" : "type-167",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2908,7 +2908,7 @@
    "referenced_type" : "type-178",
    "self_type" : "type-177",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2918,7 +2918,7 @@
    "referenced_type" : "type-181",
    "self_type" : "type-180",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2928,7 +2928,7 @@
    "referenced_type" : "type-190",
    "self_type" : "type-189",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2938,7 +2938,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-193",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2948,7 +2948,7 @@
    "referenced_type" : "type-197",
    "self_type" : "type-196",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2958,7 +2958,7 @@
    "referenced_type" : "type-200",
    "self_type" : "type-199",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2968,7 +2968,7 @@
    "referenced_type" : "type-209",
    "self_type" : "type-208",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2978,7 +2978,7 @@
    "referenced_type" : "type-217",
    "self_type" : "type-216",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2988,7 +2988,7 @@
    "referenced_type" : "type-220",
    "self_type" : "type-219",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -2998,7 +2998,7 @@
    "referenced_type" : "type-223",
    "self_type" : "type-222",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3008,7 +3008,7 @@
    "referenced_type" : "type-232",
    "self_type" : "type-231",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3018,7 +3018,7 @@
    "referenced_type" : "type-236",
    "self_type" : "type-235",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3028,7 +3028,7 @@
    "referenced_type" : "type-251",
    "self_type" : "type-250",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3038,7 +3038,7 @@
    "referenced_type" : "type-266",
    "self_type" : "type-265",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3048,7 +3048,7 @@
    "referenced_type" : "type-269",
    "self_type" : "type-268",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3058,7 +3058,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3068,7 +3068,7 @@
    "referenced_type" : "type-273",
    "self_type" : "type-272",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3078,7 +3078,7 @@
    "referenced_type" : "type-285",
    "self_type" : "type-284",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3088,7 +3088,7 @@
    "referenced_type" : "type-292",
    "self_type" : "type-291",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3098,7 +3098,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-28",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3108,7 +3108,7 @@
    "referenced_type" : "type-301",
    "self_type" : "type-300",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3118,7 +3118,7 @@
    "referenced_type" : "type-311",
    "self_type" : "type-310",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3128,7 +3128,7 @@
    "referenced_type" : "type-319",
    "self_type" : "type-318",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3138,7 +3138,7 @@
    "referenced_type" : "type-327",
    "self_type" : "type-326",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3148,7 +3148,7 @@
    "referenced_type" : "type-330",
    "self_type" : "type-329",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3158,7 +3158,7 @@
    "referenced_type" : "type-42",
    "self_type" : "type-41",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3168,7 +3168,7 @@
    "referenced_type" : "type-45",
    "self_type" : "type-44",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3178,7 +3178,7 @@
    "referenced_type" : "type-61",
    "self_type" : "type-60",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3188,7 +3188,7 @@
    "referenced_type" : "type-81",
    "self_type" : "type-80",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -3198,7 +3198,7 @@
    "referenced_type" : "type-89",
    "self_type" : "type-88",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3208,7 +3208,7 @@
    "referenced_type" : "type-2",
    "self_type" : "type-132",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "is_const" : true,
@@ -3216,7 +3216,7 @@
    "name" : "const void",
    "referenced_type" : "type-48",
    "self_type" : "type-47",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   }
  ],
  "record_types" :
@@ -3280,7 +3280,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-65",
    "size" : 64,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "unique_id" : "AndroidLogEntry_t"
   },
   {
@@ -3297,7 +3297,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-5",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_header_t"
   },
   {
@@ -3319,7 +3319,7 @@
    "referenced_type" : "type-160",
    "self_type" : "type-160",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_int_t"
   },
   {
@@ -3341,7 +3341,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-162",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_long_t"
   },
   {
@@ -3368,7 +3368,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-164",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_string_t"
   },
   {
@@ -3390,7 +3390,7 @@
    "referenced_type" : "type-161",
    "self_type" : "type-161",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_int_t"
   },
   {
@@ -3415,7 +3415,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-150",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
    "unique_id" : "_ZTS22android_log_event_list"
   },
   {
@@ -3437,7 +3437,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-163",
    "size" : 13,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_long_t"
   },
   {
@@ -3469,7 +3469,7 @@
    "referenced_type" : "type-4",
    "self_type" : "type-4",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_string_t"
   },
   {
@@ -3496,7 +3496,7 @@
    "referenced_type" : "type-159",
    "self_type" : "type-159",
    "size" : 11,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_header_t"
   },
   {
@@ -3528,7 +3528,7 @@
    "referenced_type" : "type-144",
    "self_type" : "type-144",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
    "unique_id" : "android_log_list_element"
   },
   {
@@ -3553,14 +3553,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3) at system/logging/liblog/include/log/log_event_list.h:53:3",
-   "name" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3) at system/logging/liblog/include/log/log_event_list.h:53:3",
+   "linker_set_key" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3) at system/core/liblog/include/log/log_event_list.h:53:3",
+   "name" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3) at system/core/liblog/include/log/log_event_list.h:53:3",
    "record_kind" : "union",
    "referenced_type" : "type-145",
    "self_type" : "type-145",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
-   "unique_id" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3)"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
+   "unique_id" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3)"
   },
   {
    "alignment" : 1,
@@ -3591,7 +3591,7 @@
    "referenced_type" : "type-158",
    "self_type" : "type-158",
    "size" : 7,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_pmsg_log_header_t"
   },
   {
@@ -3607,7 +3607,7 @@
    "referenced_type" : "type-84",
    "self_type" : "type-84",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -3640,14 +3640,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-85",
    "self_type" : "type-85",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -3668,7 +3668,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-17",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -3715,7 +3715,7 @@
    "referenced_type" : "type-34",
    "self_type" : "type-34",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -3767,7 +3767,7 @@
    "referenced_type" : "type-52",
    "self_type" : "type-52",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -3819,7 +3819,7 @@
    "referenced_type" : "type-62",
    "self_type" : "type-62",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -3876,7 +3876,7 @@
    "referenced_type" : "type-77",
    "self_type" : "type-77",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   }
  ],
diff --git a/29/64/x86_64/source-based/libmediandk.so.lsdump b/29/64/x86_64/source-based/libmediandk.so.lsdump
index 12fc1bd..3de7cb1 100644
--- a/29/64/x86_64/source-based/libmediandk.so.lsdump
+++ b/29/64/x86_64/source-based/libmediandk.so.lsdump
@@ -203,7 +203,7 @@
    "name" : "char []",
    "referenced_type" : "type-49",
    "self_type" : "type-2720",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -317,7 +317,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-2793",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -2045,7 +2045,7 @@
    "referenced_type" : "type-2851",
    "self_type" : "type-2851",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "AndroidEventLogType"
   },
@@ -4756,7 +4756,7 @@
    "referenced_type" : "type-2557",
    "self_type" : "type-2557",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "android_LogPriority"
   },
@@ -7238,7 +7238,7 @@
    "referenced_type" : "type-2583",
    "self_type" : "type-2583",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "log_id"
   },
@@ -13468,7 +13468,7 @@
    "referenced_type" : "type-2818",
    "self_type" : "type-2841",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -13477,7 +13477,7 @@
    "referenced_type" : "type-2693",
    "self_type" : "type-2710",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13585,7 +13585,7 @@
    "referenced_type" : "type-1077",
    "self_type" : "type-1079",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13594,7 +13594,7 @@
    "referenced_type" : "type-1366",
    "self_type" : "type-1369",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13603,7 +13603,7 @@
    "referenced_type" : "type-1478",
    "self_type" : "type-1480",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13612,7 +13612,7 @@
    "referenced_type" : "type-1501",
    "self_type" : "type-1504",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13621,7 +13621,7 @@
    "referenced_type" : "type-1646",
    "self_type" : "type-1655",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13630,7 +13630,7 @@
    "referenced_type" : "type-1695",
    "self_type" : "type-1697",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13639,7 +13639,7 @@
    "referenced_type" : "type-1740",
    "self_type" : "type-1742",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13648,7 +13648,7 @@
    "referenced_type" : "type-1788",
    "self_type" : "type-1790",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13657,7 +13657,7 @@
    "referenced_type" : "type-1878",
    "self_type" : "type-1877",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13666,7 +13666,7 @@
    "referenced_type" : "type-2310",
    "self_type" : "type-2309",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13675,7 +13675,7 @@
    "referenced_type" : "type-2659",
    "self_type" : "type-2680",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13684,7 +13684,7 @@
    "referenced_type" : "type-394",
    "self_type" : "type-396",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13693,7 +13693,7 @@
    "referenced_type" : "type-462",
    "self_type" : "type-464",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13702,7 +13702,7 @@
    "referenced_type" : "type-773",
    "self_type" : "type-809",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13711,7 +13711,7 @@
    "referenced_type" : "type-898",
    "self_type" : "type-900",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -13720,7 +13720,7 @@
    "referenced_type" : "type-959",
    "self_type" : "type-961",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -20140,7 +20140,7 @@
    "referenced_type" : "type-2818",
    "self_type" : "type-2819",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20149,7 +20149,7 @@
    "referenced_type" : "type-2693",
    "self_type" : "type-2700",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -20635,7 +20635,7 @@
    "referenced_type" : "type-2791",
    "self_type" : "type-2842",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -20644,7 +20644,7 @@
    "referenced_type" : "type-2617",
    "self_type" : "type-2669",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -21297,7 +21297,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-2720",
    "self_type" : "type-2731",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -23877,7 +23877,7 @@
    "referenced_type" : "type-2791",
    "self_type" : "type-2818",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -23887,7 +23887,7 @@
    "referenced_type" : "type-2617",
    "self_type" : "type-2693",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25457,7 +25457,7 @@
    "referenced_type" : "type-1078",
    "self_type" : "type-1077",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25467,7 +25467,7 @@
    "referenced_type" : "type-1367",
    "self_type" : "type-1366",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25477,7 +25477,7 @@
    "referenced_type" : "type-1479",
    "self_type" : "type-1478",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25487,7 +25487,7 @@
    "referenced_type" : "type-1502",
    "self_type" : "type-1501",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25497,7 +25497,7 @@
    "referenced_type" : "type-1647",
    "self_type" : "type-1646",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25507,7 +25507,7 @@
    "referenced_type" : "type-1696",
    "self_type" : "type-1695",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25517,7 +25517,7 @@
    "referenced_type" : "type-1741",
    "self_type" : "type-1740",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25527,7 +25527,7 @@
    "referenced_type" : "type-1789",
    "self_type" : "type-1788",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25537,7 +25537,7 @@
    "referenced_type" : "type-1879",
    "self_type" : "type-1878",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25547,7 +25547,7 @@
    "referenced_type" : "type-2311",
    "self_type" : "type-2310",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25557,7 +25557,7 @@
    "referenced_type" : "type-2660",
    "self_type" : "type-2659",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25567,7 +25567,7 @@
    "referenced_type" : "type-395",
    "self_type" : "type-394",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25577,7 +25577,7 @@
    "referenced_type" : "type-463",
    "self_type" : "type-462",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25587,7 +25587,7 @@
    "referenced_type" : "type-774",
    "self_type" : "type-773",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25597,7 +25597,7 @@
    "referenced_type" : "type-899",
    "self_type" : "type-898",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -25607,7 +25607,7 @@
    "referenced_type" : "type-960",
    "self_type" : "type-959",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -25627,7 +25627,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-205",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 8,
@@ -49253,7 +49253,7 @@
    "referenced_type" : "type-2791",
    "self_type" : "type-2791",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -49286,14 +49286,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2792",
    "self_type" : "type-2792",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -49314,7 +49314,7 @@
    "referenced_type" : "type-2617",
    "self_type" : "type-2617",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -49361,7 +49361,7 @@
    "referenced_type" : "type-2747",
    "self_type" : "type-2747",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -49413,7 +49413,7 @@
    "referenced_type" : "type-2769",
    "self_type" : "type-2769",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -49465,7 +49465,7 @@
    "referenced_type" : "type-2776",
    "self_type" : "type-2776",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -49522,7 +49522,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2788",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/x86_64/source-based/libstdc++.so.lsdump b/29/64/x86_64/source-based/libstdc++.so.lsdump
index 75faca6..2898e52 100644
--- a/29/64/x86_64/source-based/libstdc++.so.lsdump
+++ b/29/64/x86_64/source-based/libstdc++.so.lsdump
@@ -495,7 +495,7 @@
    "referenced_type" : "type-94",
    "self_type" : "type-94",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-23",
    "unique_id" : "android_LogPriority"
   },
@@ -549,7 +549,7 @@
    "referenced_type" : "type-95",
    "self_type" : "type-95",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-23",
    "unique_id" : "log_id"
   },
diff --git a/29/64/x86_x86_64/source-based/libOpenMAXAL.so.lsdump b/29/64/x86_x86_64/source-based/libOpenMAXAL.so.lsdump
index 0aae857..708d8b2 100644
--- a/29/64/x86_x86_64/source-based/libOpenMAXAL.so.lsdump
+++ b/29/64/x86_x86_64/source-based/libOpenMAXAL.so.lsdump
@@ -105,7 +105,7 @@
    "name" : "char []",
    "referenced_type" : "type-143",
    "self_type" : "type-814",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -218,7 +218,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-2594",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1017,7 +1017,7 @@
    "referenced_type" : "type-2612",
    "self_type" : "type-2612",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -2554,7 +2554,7 @@
    "referenced_type" : "type-2573",
    "self_type" : "type-2573",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -5028,7 +5028,7 @@
    "referenced_type" : "type-2574",
    "self_type" : "type-2574",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -15893,7 +15893,7 @@
    "referenced_type" : "type-2608",
    "self_type" : "type-2610",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -15902,7 +15902,7 @@
    "referenced_type" : "type-2580",
    "self_type" : "type-2582",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16010,7 +16010,7 @@
    "referenced_type" : "type-2164",
    "self_type" : "type-2176",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16019,7 +16019,7 @@
    "referenced_type" : "type-2359",
    "self_type" : "type-2358",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16028,7 +16028,7 @@
    "referenced_type" : "type-2576",
    "self_type" : "type-2579",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -18056,7 +18056,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-362",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20531,7 +20531,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-162",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20576,7 +20576,7 @@
    "referenced_type" : "type-2608",
    "self_type" : "type-2609",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20585,7 +20585,7 @@
    "referenced_type" : "type-2580",
    "self_type" : "type-2581",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20837,7 +20837,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2611",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20846,7 +20846,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2578",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25099,7 +25099,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-814",
    "self_type" : "type-2583",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -27985,7 +27985,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-163",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28055,7 +28055,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2608",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28065,7 +28065,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2580",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28195,7 +28195,7 @@
    "referenced_type" : "type-2165",
    "self_type" : "type-2164",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28205,7 +28205,7 @@
    "referenced_type" : "type-2360",
    "self_type" : "type-2359",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28215,7 +28215,7 @@
    "referenced_type" : "type-2577",
    "self_type" : "type-2576",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -60152,7 +60152,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2592",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -60185,14 +60185,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2593",
    "self_type" : "type-2593",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -60213,7 +60213,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2575",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -60260,7 +60260,7 @@
    "referenced_type" : "type-2584",
    "self_type" : "type-2584",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -60312,7 +60312,7 @@
    "referenced_type" : "type-2586",
    "self_type" : "type-2586",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -60364,7 +60364,7 @@
    "referenced_type" : "type-2588",
    "self_type" : "type-2588",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -60421,7 +60421,7 @@
    "referenced_type" : "type-2590",
    "self_type" : "type-2590",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/x86_x86_64/source-based/libOpenSLES.so.lsdump b/29/64/x86_x86_64/source-based/libOpenSLES.so.lsdump
index 37bffbf..fc7e1ec 100644
--- a/29/64/x86_x86_64/source-based/libOpenSLES.so.lsdump
+++ b/29/64/x86_x86_64/source-based/libOpenSLES.so.lsdump
@@ -105,7 +105,7 @@
    "name" : "char []",
    "referenced_type" : "type-143",
    "self_type" : "type-814",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -218,7 +218,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-2594",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -1053,7 +1053,7 @@
    "referenced_type" : "type-2612",
    "self_type" : "type-2612",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -2590,7 +2590,7 @@
    "referenced_type" : "type-2573",
    "self_type" : "type-2573",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -5064,7 +5064,7 @@
    "referenced_type" : "type-2574",
    "self_type" : "type-2574",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -16001,7 +16001,7 @@
    "referenced_type" : "type-2608",
    "self_type" : "type-2610",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -16010,7 +16010,7 @@
    "referenced_type" : "type-2580",
    "self_type" : "type-2582",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16118,7 +16118,7 @@
    "referenced_type" : "type-2164",
    "self_type" : "type-2176",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16127,7 +16127,7 @@
    "referenced_type" : "type-2359",
    "self_type" : "type-2358",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -16136,7 +16136,7 @@
    "referenced_type" : "type-2576",
    "self_type" : "type-2579",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -18164,7 +18164,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-362",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20639,7 +20639,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-162",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20684,7 +20684,7 @@
    "referenced_type" : "type-2608",
    "self_type" : "type-2609",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20693,7 +20693,7 @@
    "referenced_type" : "type-2580",
    "self_type" : "type-2581",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20945,7 +20945,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2611",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20954,7 +20954,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2578",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25207,7 +25207,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-814",
    "self_type" : "type-2583",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28093,7 +28093,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-163",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28163,7 +28163,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2608",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -28173,7 +28173,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2580",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28303,7 +28303,7 @@
    "referenced_type" : "type-2165",
    "self_type" : "type-2164",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28313,7 +28313,7 @@
    "referenced_type" : "type-2360",
    "self_type" : "type-2359",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -28323,7 +28323,7 @@
    "referenced_type" : "type-2577",
    "self_type" : "type-2576",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -60260,7 +60260,7 @@
    "referenced_type" : "type-2592",
    "self_type" : "type-2592",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -60293,14 +60293,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2593",
    "self_type" : "type-2593",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -60321,7 +60321,7 @@
    "referenced_type" : "type-2575",
    "self_type" : "type-2575",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -60368,7 +60368,7 @@
    "referenced_type" : "type-2584",
    "self_type" : "type-2584",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -60420,7 +60420,7 @@
    "referenced_type" : "type-2586",
    "self_type" : "type-2586",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -60472,7 +60472,7 @@
    "referenced_type" : "type-2588",
    "self_type" : "type-2588",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -60529,7 +60529,7 @@
    "referenced_type" : "type-2590",
    "self_type" : "type-2590",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/x86_x86_64/source-based/libRS.so.lsdump b/29/64/x86_x86_64/source-based/libRS.so.lsdump
index 0b3e021..5dd9979 100644
--- a/29/64/x86_x86_64/source-based/libRS.so.lsdump
+++ b/29/64/x86_x86_64/source-based/libRS.so.lsdump
@@ -400,7 +400,7 @@
    "name" : "char []",
    "referenced_type" : "type-18",
    "self_type" : "type-4016",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 2,
@@ -642,7 +642,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-4029",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1394,7 +1394,7 @@
    "referenced_type" : "type-4036",
    "self_type" : "type-4036",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "AndroidEventLogType"
   },
@@ -4284,7 +4284,7 @@
    "referenced_type" : "type-3996",
    "self_type" : "type-3996",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "android_LogPriority"
   },
@@ -4418,7 +4418,7 @@
    "referenced_type" : "type-3997",
    "self_type" : "type-3997",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-8",
    "unique_id" : "log_id"
   },
@@ -16315,7 +16315,7 @@
    "referenced_type" : "type-4032",
    "self_type" : "type-4034",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -16324,7 +16324,7 @@
    "referenced_type" : "type-4012",
    "self_type" : "type-4014",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -17278,7 +17278,7 @@
    "referenced_type" : "type-4009",
    "self_type" : "type-4011",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -17287,7 +17287,7 @@
    "referenced_type" : "type-6899",
    "self_type" : "type-6900",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "linker_set_key" : "const uniform_int_distribution<_IntType> &",
@@ -19887,7 +19887,7 @@
    "referenced_type" : "type-4032",
    "self_type" : "type-4033",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -19896,7 +19896,7 @@
    "referenced_type" : "type-4012",
    "self_type" : "type-4013",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21867,7 +21867,7 @@
    "referenced_type" : "type-4027",
    "self_type" : "type-4035",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -21876,7 +21876,7 @@
    "referenced_type" : "type-4007",
    "self_type" : "type-4010",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -26379,7 +26379,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-4016",
    "self_type" : "type-4017",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -27131,7 +27131,7 @@
    "referenced_type" : "type-4027",
    "self_type" : "type-4032",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -27141,7 +27141,7 @@
    "referenced_type" : "type-4007",
    "self_type" : "type-4012",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29327,7 +29327,7 @@
    "referenced_type" : "type-2415",
    "self_type" : "type-4009",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -29337,7 +29337,7 @@
    "referenced_type" : "type-6891",
    "self_type" : "type-6899",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -36872,7 +36872,7 @@
    "referenced_type" : "type-4027",
    "self_type" : "type-4027",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -36905,14 +36905,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-4028",
    "self_type" : "type-4028",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -36933,7 +36933,7 @@
    "referenced_type" : "type-4007",
    "self_type" : "type-4007",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -36980,7 +36980,7 @@
    "referenced_type" : "type-4018",
    "self_type" : "type-4018",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -37032,7 +37032,7 @@
    "referenced_type" : "type-4021",
    "self_type" : "type-4021",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -37084,7 +37084,7 @@
    "referenced_type" : "type-4023",
    "self_type" : "type-4023",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -37141,7 +37141,7 @@
    "referenced_type" : "type-4025",
    "self_type" : "type-4025",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/x86_x86_64/source-based/liblog.so.lsdump b/29/64/x86_x86_64/source-based/liblog.so.lsdump
index 83bd212..5699e3a 100644
--- a/29/64/x86_x86_64/source-based/liblog.so.lsdump
+++ b/29/64/x86_x86_64/source-based/liblog.so.lsdump
@@ -6,7 +6,7 @@
    "name" : "char []",
    "referenced_type" : "type-9",
    "self_type" : "type-8",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -15,7 +15,7 @@
    "referenced_type" : "type-86",
    "self_type" : "type-85",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   }
  ],
  "builtin_types" :
@@ -352,7 +352,7 @@
    "referenced_type" : "type-126",
    "self_type" : "type-126",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidEventLogType"
   },
@@ -442,7 +442,7 @@
    "referenced_type" : "type-64",
    "self_type" : "type-64",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "underlying_type" : "type-2",
    "unique_id" : "AndroidLogPrintFormat"
   },
@@ -492,7 +492,7 @@
    "referenced_type" : "type-1",
    "self_type" : "type-1",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
@@ -546,7 +546,7 @@
    "referenced_type" : "type-104",
    "self_type" : "type-104",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   },
@@ -600,7 +600,7 @@
    "referenced_type" : "type-32",
    "self_type" : "type-32",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_id.h",
+   "source_file" : "/system/core/liblog/include/log/log_id.h",
    "underlying_type" : "type-2",
    "unique_id" : "log_id"
   }
@@ -635,7 +635,7 @@
    "referenced_type" : "type-133",
    "return_type" : "type-6",
    "self_type" : "type-133",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "functions" :
@@ -656,7 +656,7 @@
     }
    ],
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bswrite",
@@ -671,7 +671,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_btwrite",
@@ -692,7 +692,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_buf_print",
@@ -713,7 +713,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_buf_write",
@@ -734,7 +734,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bwrite",
@@ -752,13 +752,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_close",
    "linker_set_key" : "__android_log_close",
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_error_write",
@@ -782,13 +782,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_safetynet.h"
+   "source_file" : "/system/core/liblog/include/log/log_safetynet.h"
   },
   {
    "function_name" : "__android_log_is_debuggable",
    "linker_set_key" : "__android_log_is_debuggable",
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_properties.h"
+   "source_file" : "/system/core/liblog/include/log/log_properties.h"
   },
   {
    "function_name" : "__android_log_is_loggable",
@@ -806,7 +806,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_main.h"
+   "source_file" : "/system/core/liblog/include/log/log_main.h"
   },
   {
    "function_name" : "__android_log_is_loggable_len",
@@ -827,7 +827,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_main.h"
+   "source_file" : "/system/core/liblog/include/log/log_main.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_read",
@@ -851,7 +851,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_write",
@@ -875,7 +875,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_print",
@@ -893,13 +893,13 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_security",
    "linker_set_key" : "__android_log_security",
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_security_bswrite",
@@ -914,7 +914,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_vprint",
@@ -935,7 +935,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write",
@@ -953,7 +953,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_logger_get_buffer_size",
@@ -965,7 +965,7 @@
     }
    ],
    "return_type" : "type-40",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_logger_property_get_bool",
@@ -980,7 +980,7 @@
     }
    ],
    "return_type" : "type-3",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_destroy",
@@ -992,7 +992,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_id_to_name",
@@ -1004,7 +1004,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_log_parser_reset",
@@ -1022,7 +1022,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_processBinaryLogBuffer",
@@ -1046,7 +1046,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_processLogBuffer",
@@ -1061,7 +1061,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_read_next",
@@ -1073,7 +1073,7 @@
     }
    ],
    "return_type" : "type-143",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_reset",
@@ -1085,7 +1085,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_float32",
@@ -1100,7 +1100,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int32",
@@ -1115,7 +1115,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int64",
@@ -1130,7 +1130,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list",
@@ -1145,7 +1145,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_begin",
@@ -1157,7 +1157,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_buffer",
@@ -1172,7 +1172,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_write_list_end",
@@ -1184,7 +1184,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8",
@@ -1199,7 +1199,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8_len",
@@ -1217,7 +1217,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_logger_clear",
@@ -1229,7 +1229,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_id",
@@ -1241,7 +1241,7 @@
     }
    ],
    "return_type" : "type-32",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_readable_size",
@@ -1253,7 +1253,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_size",
@@ -1265,7 +1265,7 @@
     }
    ],
    "return_type" : "type-39",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_version",
@@ -1277,7 +1277,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_prune_list",
@@ -1295,7 +1295,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_statistics",
@@ -1313,7 +1313,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc",
@@ -1331,7 +1331,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc_time",
@@ -1349,7 +1349,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_free",
@@ -1361,7 +1361,7 @@
     }
    ],
    "return_type" : "type-50",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_open",
@@ -1382,7 +1382,7 @@
     }
    ],
    "return_type" : "type-41",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_read",
@@ -1397,7 +1397,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_open",
@@ -1412,7 +1412,7 @@
     }
    ],
    "return_type" : "type-37",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_log_size",
@@ -1427,7 +1427,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_prune_list",
@@ -1445,7 +1445,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_lookupEventTagNum",
@@ -1466,7 +1466,7 @@
     }
    ],
    "return_type" : "type-6",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "android_name_to_log_id",
@@ -1478,7 +1478,7 @@
     }
    ],
    "return_type" : "type-104",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_openEventTagMap",
@@ -1490,7 +1490,7 @@
     }
    ],
    "return_type" : "type-81",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "create_android_log_parser",
@@ -1505,7 +1505,7 @@
     }
    ],
    "return_type" : "type-147",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "create_android_logger",
@@ -1517,7 +1517,7 @@
     }
    ],
    "return_type" : "type-147",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "global_vars" : [],
@@ -1530,7 +1530,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-154",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1539,7 +1539,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-115",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1548,7 +1548,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-27",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1557,7 +1557,7 @@
    "referenced_type" : "type-108",
    "self_type" : "type-110",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1566,7 +1566,7 @@
    "referenced_type" : "type-118",
    "self_type" : "type-121",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1575,7 +1575,7 @@
    "referenced_type" : "type-129",
    "self_type" : "type-132",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1584,7 +1584,7 @@
    "referenced_type" : "type-155",
    "self_type" : "type-157",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1593,7 +1593,7 @@
    "referenced_type" : "type-172",
    "self_type" : "type-174",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1602,7 +1602,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-22",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1611,7 +1611,7 @@
    "referenced_type" : "type-204",
    "self_type" : "type-206",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1620,7 +1620,7 @@
    "referenced_type" : "type-212",
    "self_type" : "type-214",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1629,7 +1629,7 @@
    "referenced_type" : "type-244",
    "self_type" : "type-246",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1638,7 +1638,7 @@
    "referenced_type" : "type-275",
    "self_type" : "type-277",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1647,7 +1647,7 @@
    "referenced_type" : "type-286",
    "self_type" : "type-288",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1656,7 +1656,7 @@
    "referenced_type" : "type-294",
    "self_type" : "type-296",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1665,7 +1665,7 @@
    "referenced_type" : "type-302",
    "self_type" : "type-304",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1674,7 +1674,7 @@
    "referenced_type" : "type-312",
    "self_type" : "type-314",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1683,7 +1683,7 @@
    "referenced_type" : "type-320",
    "self_type" : "type-322",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1692,7 +1692,7 @@
    "referenced_type" : "type-331",
    "self_type" : "type-333",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1701,7 +1701,7 @@
    "referenced_type" : "type-341",
    "self_type" : "type-343",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1710,7 +1710,7 @@
    "referenced_type" : "type-56",
    "self_type" : "type-58",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1719,7 +1719,7 @@
    "referenced_type" : "type-92",
    "self_type" : "type-94",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1728,7 +1728,7 @@
    "referenced_type" : "type-102",
    "self_type" : "type-101",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1737,7 +1737,7 @@
    "referenced_type" : "type-111",
    "self_type" : "type-114",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1746,7 +1746,7 @@
    "referenced_type" : "type-123",
    "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1755,7 +1755,7 @@
    "referenced_type" : "type-138",
    "self_type" : "type-137",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1764,7 +1764,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1773,7 +1773,7 @@
    "referenced_type" : "type-141",
    "self_type" : "type-140",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1782,7 +1782,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-166",
    "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" : "type-177",
    "self_type" : "type-176",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1800,7 +1800,7 @@
    "referenced_type" : "type-180",
    "self_type" : "type-182",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1809,7 +1809,7 @@
    "referenced_type" : "type-189",
    "self_type" : "type-191",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1818,7 +1818,7 @@
    "referenced_type" : "type-193",
    "self_type" : "type-192",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1827,7 +1827,7 @@
    "referenced_type" : "type-196",
    "self_type" : "type-195",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1836,7 +1836,7 @@
    "referenced_type" : "type-199",
    "self_type" : "type-198",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1845,7 +1845,7 @@
    "referenced_type" : "type-208",
    "self_type" : "type-207",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1854,7 +1854,7 @@
    "referenced_type" : "type-216",
    "self_type" : "type-215",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1863,7 +1863,7 @@
    "referenced_type" : "type-220",
    "self_type" : "type-219",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1872,7 +1872,7 @@
    "referenced_type" : "type-222",
    "self_type" : "type-224",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1881,7 +1881,7 @@
    "referenced_type" : "type-231",
    "self_type" : "type-234",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1890,7 +1890,7 @@
    "referenced_type" : "type-235",
    "self_type" : "type-237",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1899,7 +1899,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-247",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1908,7 +1908,7 @@
    "referenced_type" : "type-25",
    "self_type" : "type-24",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1917,7 +1917,7 @@
    "referenced_type" : "type-263",
    "self_type" : "type-262",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1926,7 +1926,7 @@
    "referenced_type" : "type-266",
    "self_type" : "type-265",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1935,7 +1935,7 @@
    "referenced_type" : "type-270",
    "self_type" : "type-272",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1944,7 +1944,7 @@
    "referenced_type" : "type-28",
    "self_type" : "type-31",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1953,7 +1953,7 @@
    "referenced_type" : "type-282",
    "self_type" : "type-281",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1962,7 +1962,7 @@
    "referenced_type" : "type-289",
    "self_type" : "type-291",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1971,7 +1971,7 @@
    "referenced_type" : "type-298",
    "self_type" : "type-297",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1980,7 +1980,7 @@
    "referenced_type" : "type-308",
    "self_type" : "type-307",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1989,7 +1989,7 @@
    "referenced_type" : "type-316",
    "self_type" : "type-315",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -1998,7 +1998,7 @@
    "referenced_type" : "type-324",
    "self_type" : "type-323",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2007,7 +2007,7 @@
    "referenced_type" : "type-327",
    "self_type" : "type-326",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2016,7 +2016,7 @@
    "referenced_type" : "type-43",
    "self_type" : "type-45",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2025,7 +2025,7 @@
    "referenced_type" : "type-46",
    "self_type" : "type-48",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2034,7 +2034,7 @@
    "referenced_type" : "type-60",
    "self_type" : "type-59",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2043,7 +2043,7 @@
    "referenced_type" : "type-79",
    "self_type" : "type-78",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2052,7 +2052,7 @@
    "referenced_type" : "type-87",
    "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2061,7 +2061,7 @@
    "referenced_type" : "type-98",
    "self_type" : "type-97",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   }
  ],
  "pointer_types" :
@@ -2073,7 +2073,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-69",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2082,7 +2082,7 @@
    "referenced_type" : "type-252",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2091,7 +2091,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-66",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2100,7 +2100,7 @@
    "referenced_type" : "type-269",
    "self_type" : "type-268",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2109,7 +2109,7 @@
    "referenced_type" : "type-82",
    "self_type" : "type-81",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2118,7 +2118,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-105",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2127,7 +2127,7 @@
    "referenced_type" : "type-117",
    "self_type" : "type-116",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2136,7 +2136,7 @@
    "referenced_type" : "type-128",
    "self_type" : "type-127",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2145,7 +2145,7 @@
    "referenced_type" : "type-148",
    "self_type" : "type-147",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2154,7 +2154,7 @@
    "referenced_type" : "type-171",
    "self_type" : "type-170",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2163,7 +2163,7 @@
    "referenced_type" : "type-19",
    "self_type" : "type-18",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2172,7 +2172,7 @@
    "referenced_type" : "type-202",
    "self_type" : "type-201",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2181,7 +2181,7 @@
    "referenced_type" : "type-211",
    "self_type" : "type-210",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2190,7 +2190,7 @@
    "referenced_type" : "type-242",
    "self_type" : "type-241",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2199,7 +2199,7 @@
    "referenced_type" : "type-274",
    "self_type" : "type-273",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2208,7 +2208,7 @@
    "referenced_type" : "type-285",
    "self_type" : "type-284",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2217,7 +2217,7 @@
    "referenced_type" : "type-293",
    "self_type" : "type-292",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2226,7 +2226,7 @@
    "referenced_type" : "type-301",
    "self_type" : "type-300",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2235,7 +2235,7 @@
    "referenced_type" : "type-311",
    "self_type" : "type-310",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2244,7 +2244,7 @@
    "referenced_type" : "type-319",
    "self_type" : "type-318",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2253,7 +2253,7 @@
    "referenced_type" : "type-330",
    "self_type" : "type-329",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2262,7 +2262,7 @@
    "referenced_type" : "type-335",
    "self_type" : "type-334",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2271,7 +2271,7 @@
    "referenced_type" : "type-53",
    "self_type" : "type-52",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2280,7 +2280,7 @@
    "referenced_type" : "type-91",
    "self_type" : "type-90",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2289,7 +2289,7 @@
    "referenced_type" : "type-147",
    "self_type" : "type-149",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2298,7 +2298,7 @@
    "referenced_type" : "type-201",
    "self_type" : "type-203",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2307,7 +2307,7 @@
    "referenced_type" : "type-334",
    "self_type" : "type-336",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2316,7 +2316,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-151",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2325,7 +2325,7 @@
    "referenced_type" : "type-9",
    "self_type" : "type-125",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2334,7 +2334,7 @@
    "referenced_type" : "type-73",
    "self_type" : "type-74",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2343,7 +2343,7 @@
    "referenced_type" : "type-255",
    "self_type" : "type-257",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2352,7 +2352,7 @@
    "referenced_type" : "type-278",
    "self_type" : "type-280",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2361,7 +2361,7 @@
    "referenced_type" : "type-70",
    "self_type" : "type-72",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2370,7 +2370,7 @@
    "referenced_type" : "type-95",
    "self_type" : "type-100",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2379,7 +2379,7 @@
    "referenced_type" : "type-152",
    "self_type" : "type-153",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2388,7 +2388,7 @@
    "referenced_type" : "type-12",
    "self_type" : "type-11",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2397,7 +2397,7 @@
    "referenced_type" : "type-11",
    "self_type" : "type-10",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2406,7 +2406,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-113",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2415,7 +2415,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-23",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2424,7 +2424,7 @@
    "referenced_type" : "type-49",
    "self_type" : "type-51",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "alignment" : 4,
@@ -2433,7 +2433,7 @@
    "referenced_type" : "type-133",
    "self_type" : "type-135",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2442,7 +2442,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-120",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2451,7 +2451,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-136",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2460,7 +2460,7 @@
    "referenced_type" : "type-186",
    "self_type" : "type-185",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2469,7 +2469,7 @@
    "referenced_type" : "type-228",
    "self_type" : "type-227",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2478,7 +2478,7 @@
    "referenced_type" : "type-38",
    "self_type" : "type-37",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2487,7 +2487,7 @@
    "referenced_type" : "type-34",
    "self_type" : "type-68",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2496,7 +2496,7 @@
    "referenced_type" : "type-188",
    "self_type" : "type-187",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2505,7 +2505,7 @@
    "referenced_type" : "type-230",
    "self_type" : "type-229",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2514,7 +2514,7 @@
    "referenced_type" : "type-42",
    "self_type" : "type-41",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -2523,7 +2523,7 @@
    "referenced_type" : "type-2",
    "self_type" : "type-75",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2532,7 +2532,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-134",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "qualified_types" :
@@ -2543,7 +2543,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-8",
    "self_type" : "type-33",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2553,7 +2553,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-73",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "is_const" : true,
@@ -2561,7 +2561,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-256",
    "self_type" : "type-255",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2571,7 +2571,7 @@
    "referenced_type" : "type-279",
    "self_type" : "type-278",
    "size" : 116,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "is_const" : true,
@@ -2579,7 +2579,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "type-71",
    "self_type" : "type-70",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -2589,7 +2589,7 @@
    "referenced_type" : "type-96",
    "self_type" : "type-95",
    "size" : 116,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -2599,7 +2599,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-152",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2609,7 +2609,7 @@
    "referenced_type" : "type-9",
    "self_type" : "type-12",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2619,7 +2619,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-107",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -2629,7 +2629,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-16",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2639,7 +2639,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-108",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2649,7 +2649,7 @@
    "referenced_type" : "type-119",
    "self_type" : "type-118",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2659,7 +2659,7 @@
    "referenced_type" : "type-130",
    "self_type" : "type-129",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2669,7 +2669,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-155",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2679,7 +2679,7 @@
    "referenced_type" : "type-173",
    "self_type" : "type-172",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2689,7 +2689,7 @@
    "referenced_type" : "type-205",
    "self_type" : "type-204",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2699,7 +2699,7 @@
    "referenced_type" : "type-213",
    "self_type" : "type-212",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2709,7 +2709,7 @@
    "referenced_type" : "type-21",
    "self_type" : "type-20",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2719,7 +2719,7 @@
    "referenced_type" : "type-245",
    "self_type" : "type-244",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2729,7 +2729,7 @@
    "referenced_type" : "type-276",
    "self_type" : "type-275",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2739,7 +2739,7 @@
    "referenced_type" : "type-287",
    "self_type" : "type-286",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2749,7 +2749,7 @@
    "referenced_type" : "type-295",
    "self_type" : "type-294",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2759,7 +2759,7 @@
    "referenced_type" : "type-303",
    "self_type" : "type-302",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2769,7 +2769,7 @@
    "referenced_type" : "type-313",
    "self_type" : "type-312",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2779,7 +2779,7 @@
    "referenced_type" : "type-321",
    "self_type" : "type-320",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2789,7 +2789,7 @@
    "referenced_type" : "type-332",
    "self_type" : "type-331",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2799,7 +2799,7 @@
    "referenced_type" : "type-342",
    "self_type" : "type-341",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2809,7 +2809,7 @@
    "referenced_type" : "type-57",
    "self_type" : "type-56",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2819,7 +2819,7 @@
    "referenced_type" : "type-93",
    "self_type" : "type-92",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2829,7 +2829,7 @@
    "referenced_type" : "type-103",
    "self_type" : "type-102",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2839,7 +2839,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-111",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2849,7 +2849,7 @@
    "referenced_type" : "type-124",
    "self_type" : "type-123",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2859,7 +2859,7 @@
    "referenced_type" : "type-139",
    "self_type" : "type-138",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2869,7 +2869,7 @@
    "referenced_type" : "type-142",
    "self_type" : "type-141",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2879,7 +2879,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-14",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2889,7 +2889,7 @@
    "referenced_type" : "type-168",
    "self_type" : "type-167",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2899,7 +2899,7 @@
    "referenced_type" : "type-178",
    "self_type" : "type-177",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2909,7 +2909,7 @@
    "referenced_type" : "type-181",
    "self_type" : "type-180",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2919,7 +2919,7 @@
    "referenced_type" : "type-190",
    "self_type" : "type-189",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2929,7 +2929,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-193",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2939,7 +2939,7 @@
    "referenced_type" : "type-197",
    "self_type" : "type-196",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2949,7 +2949,7 @@
    "referenced_type" : "type-200",
    "self_type" : "type-199",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2959,7 +2959,7 @@
    "referenced_type" : "type-209",
    "self_type" : "type-208",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2969,7 +2969,7 @@
    "referenced_type" : "type-217",
    "self_type" : "type-216",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2979,7 +2979,7 @@
    "referenced_type" : "type-221",
    "self_type" : "type-220",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2989,7 +2989,7 @@
    "referenced_type" : "type-223",
    "self_type" : "type-222",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -2999,7 +2999,7 @@
    "referenced_type" : "type-232",
    "self_type" : "type-231",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3009,7 +3009,7 @@
    "referenced_type" : "type-236",
    "self_type" : "type-235",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3019,7 +3019,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-248",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3029,7 +3029,7 @@
    "referenced_type" : "type-264",
    "self_type" : "type-263",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3039,7 +3039,7 @@
    "referenced_type" : "type-267",
    "self_type" : "type-266",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3049,7 +3049,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3059,7 +3059,7 @@
    "referenced_type" : "type-271",
    "self_type" : "type-270",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3069,7 +3069,7 @@
    "referenced_type" : "type-283",
    "self_type" : "type-282",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3079,7 +3079,7 @@
    "referenced_type" : "type-290",
    "self_type" : "type-289",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3089,7 +3089,7 @@
    "referenced_type" : "type-299",
    "self_type" : "type-298",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3099,7 +3099,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-28",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3109,7 +3109,7 @@
    "referenced_type" : "type-309",
    "self_type" : "type-308",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3119,7 +3119,7 @@
    "referenced_type" : "type-317",
    "self_type" : "type-316",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3129,7 +3129,7 @@
    "referenced_type" : "type-325",
    "self_type" : "type-324",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3139,7 +3139,7 @@
    "referenced_type" : "type-328",
    "self_type" : "type-327",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3149,7 +3149,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-43",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3159,7 +3159,7 @@
    "referenced_type" : "type-47",
    "self_type" : "type-46",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3169,7 +3169,7 @@
    "referenced_type" : "type-61",
    "self_type" : "type-60",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3179,7 +3179,7 @@
    "referenced_type" : "type-80",
    "self_type" : "type-79",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3189,7 +3189,7 @@
    "referenced_type" : "type-88",
    "self_type" : "type-87",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3199,7 +3199,7 @@
    "referenced_type" : "type-99",
    "self_type" : "type-98",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -3209,7 +3209,7 @@
    "referenced_type" : "type-2",
    "self_type" : "type-131",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "is_const" : true,
@@ -3217,7 +3217,7 @@
    "name" : "const void",
    "referenced_type" : "type-50",
    "self_type" : "type-49",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   }
  ],
  "record_types" :
@@ -3281,7 +3281,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-65",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "unique_id" : "AndroidLogEntry_t"
   },
   {
@@ -3298,7 +3298,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-5",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_header_t"
   },
   {
@@ -3320,7 +3320,7 @@
    "referenced_type" : "type-160",
    "self_type" : "type-160",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_int_t"
   },
   {
@@ -3342,7 +3342,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-162",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_long_t"
   },
   {
@@ -3369,7 +3369,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-164",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_event_string_t"
   },
   {
@@ -3391,7 +3391,7 @@
    "referenced_type" : "type-161",
    "self_type" : "type-161",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_int_t"
   },
   {
@@ -3416,7 +3416,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-150",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
    "unique_id" : "_ZTS22android_log_event_list"
   },
   {
@@ -3438,7 +3438,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-163",
    "size" : 13,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_long_t"
   },
   {
@@ -3470,7 +3470,7 @@
    "referenced_type" : "type-4",
    "self_type" : "type-4",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_event_string_t"
   },
   {
@@ -3497,7 +3497,7 @@
    "referenced_type" : "type-159",
    "self_type" : "type-159",
    "size" : 11,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_log_header_t"
   },
   {
@@ -3529,7 +3529,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-143",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
    "unique_id" : "android_log_list_element"
   },
   {
@@ -3554,14 +3554,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3) at system/logging/liblog/include/log/log_event_list.h:53:3",
-   "name" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3) at system/logging/liblog/include/log/log_event_list.h:53:3",
+   "linker_set_key" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3) at system/core/liblog/include/log/log_event_list.h:53:3",
+   "name" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3) at system/core/liblog/include/log/log_event_list.h:53:3",
    "record_kind" : "union",
    "referenced_type" : "type-144",
    "self_type" : "type-144",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h",
-   "unique_id" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:53:3)"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h",
+   "unique_id" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:53:3)"
   },
   {
    "alignment" : 1,
@@ -3592,7 +3592,7 @@
    "referenced_type" : "type-158",
    "self_type" : "type-158",
    "size" : 7,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h",
+   "source_file" : "/system/core/liblog/include/private/android_logger.h",
    "unique_id" : "android_pmsg_log_header_t"
   },
   {
@@ -3608,7 +3608,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-83",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -3641,14 +3641,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-84",
    "self_type" : "type-84",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -3669,7 +3669,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-17",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -3716,7 +3716,7 @@
    "referenced_type" : "type-34",
    "self_type" : "type-34",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -3768,7 +3768,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-54",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -3820,7 +3820,7 @@
    "referenced_type" : "type-62",
    "self_type" : "type-62",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -3877,7 +3877,7 @@
    "referenced_type" : "type-76",
    "self_type" : "type-76",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   }
  ],
diff --git a/29/64/x86_x86_64/source-based/libmediandk.so.lsdump b/29/64/x86_x86_64/source-based/libmediandk.so.lsdump
index 7039f59..6553a35 100644
--- a/29/64/x86_x86_64/source-based/libmediandk.so.lsdump
+++ b/29/64/x86_x86_64/source-based/libmediandk.so.lsdump
@@ -203,7 +203,7 @@
    "name" : "char []",
    "referenced_type" : "type-42",
    "self_type" : "type-2719",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -308,7 +308,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-2790",
    "size" : 5121,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -2036,7 +2036,7 @@
    "referenced_type" : "type-2851",
    "self_type" : "type-2851",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h",
+   "source_file" : "/system/core/liblog/include/log/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "AndroidEventLogType"
   },
@@ -4747,7 +4747,7 @@
    "referenced_type" : "type-2569",
    "self_type" : "type-2569",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "android_LogPriority"
   },
@@ -7229,7 +7229,7 @@
    "referenced_type" : "type-2603",
    "self_type" : "type-2603",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-14",
    "unique_id" : "log_id"
   },
@@ -13444,7 +13444,7 @@
    "referenced_type" : "type-2807",
    "self_type" : "type-2831",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -13453,7 +13453,7 @@
    "referenced_type" : "type-2689",
    "self_type" : "type-2708",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13561,7 +13561,7 @@
    "referenced_type" : "type-1065",
    "self_type" : "type-1067",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13570,7 +13570,7 @@
    "referenced_type" : "type-1359",
    "self_type" : "type-1361",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13579,7 +13579,7 @@
    "referenced_type" : "type-1469",
    "self_type" : "type-1471",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13588,7 +13588,7 @@
    "referenced_type" : "type-1492",
    "self_type" : "type-1495",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13597,7 +13597,7 @@
    "referenced_type" : "type-1637",
    "self_type" : "type-1646",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13606,7 +13606,7 @@
    "referenced_type" : "type-1680",
    "self_type" : "type-1688",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13615,7 +13615,7 @@
    "referenced_type" : "type-1731",
    "self_type" : "type-1733",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13624,7 +13624,7 @@
    "referenced_type" : "type-1779",
    "self_type" : "type-1781",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13633,7 +13633,7 @@
    "referenced_type" : "type-1868",
    "self_type" : "type-1867",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13642,7 +13642,7 @@
    "referenced_type" : "type-2300",
    "self_type" : "type-2299",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13651,7 +13651,7 @@
    "referenced_type" : "type-2655",
    "self_type" : "type-2680",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13660,7 +13660,7 @@
    "referenced_type" : "type-387",
    "self_type" : "type-389",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13669,7 +13669,7 @@
    "referenced_type" : "type-455",
    "self_type" : "type-457",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13678,7 +13678,7 @@
    "referenced_type" : "type-793",
    "self_type" : "type-799",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13687,7 +13687,7 @@
    "referenced_type" : "type-886",
    "self_type" : "type-890",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -13696,7 +13696,7 @@
    "referenced_type" : "type-949",
    "self_type" : "type-951",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20125,7 +20125,7 @@
    "referenced_type" : "type-2807",
    "self_type" : "type-2830",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20134,7 +20134,7 @@
    "referenced_type" : "type-2689",
    "self_type" : "type-2698",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -20638,7 +20638,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2841",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -20647,7 +20647,7 @@
    "referenced_type" : "type-2630",
    "self_type" : "type-2669",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -21264,7 +21264,7 @@
    "name" : "char const[]",
    "referenced_type" : "type-2719",
    "self_type" : "type-2735",
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -23844,7 +23844,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2807",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
@@ -23854,7 +23854,7 @@
    "referenced_type" : "type-2630",
    "self_type" : "type-2689",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25424,7 +25424,7 @@
    "referenced_type" : "type-1066",
    "self_type" : "type-1065",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25434,7 +25434,7 @@
    "referenced_type" : "type-1360",
    "self_type" : "type-1359",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25444,7 +25444,7 @@
    "referenced_type" : "type-1470",
    "self_type" : "type-1469",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25454,7 +25454,7 @@
    "referenced_type" : "type-1493",
    "self_type" : "type-1492",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25464,7 +25464,7 @@
    "referenced_type" : "type-1638",
    "self_type" : "type-1637",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25474,7 +25474,7 @@
    "referenced_type" : "type-1681",
    "self_type" : "type-1680",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25484,7 +25484,7 @@
    "referenced_type" : "type-1732",
    "self_type" : "type-1731",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25494,7 +25494,7 @@
    "referenced_type" : "type-1780",
    "self_type" : "type-1779",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25504,7 +25504,7 @@
    "referenced_type" : "type-1869",
    "self_type" : "type-1868",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25514,7 +25514,7 @@
    "referenced_type" : "type-2301",
    "self_type" : "type-2300",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25524,7 +25524,7 @@
    "referenced_type" : "type-2656",
    "self_type" : "type-2655",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25534,7 +25534,7 @@
    "referenced_type" : "type-388",
    "self_type" : "type-387",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25544,7 +25544,7 @@
    "referenced_type" : "type-456",
    "self_type" : "type-455",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25554,7 +25554,7 @@
    "referenced_type" : "type-794",
    "self_type" : "type-793",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25564,7 +25564,7 @@
    "referenced_type" : "type-887",
    "self_type" : "type-886",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -25574,7 +25574,7 @@
    "referenced_type" : "type-950",
    "self_type" : "type-949",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 1,
@@ -25594,7 +25594,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-195",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h"
+   "source_file" : "/system/core/liblog/include/log/log_time.h"
   },
   {
    "alignment" : 4,
@@ -49210,7 +49210,7 @@
    "referenced_type" : "type-2788",
    "self_type" : "type-2788",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
   },
   {
@@ -49243,14 +49243,14 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3) at system/logging/liblog/include/log/log_read.h:139:3",
+   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
+   "name" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3) at system/core/liblog/include/log/log_read.h:139:3",
    "record_kind" : "union",
    "referenced_type" : "type-2789",
    "self_type" : "type-2789",
    "size" : 5124,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/logging/liblog/include/log/log_read.h:139:3)"
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
+   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include/log/log_read.h:139:3)"
   },
   {
    "alignment" : 1,
@@ -49271,7 +49271,7 @@
    "referenced_type" : "type-2630",
    "self_type" : "type-2630",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_time.h",
+   "source_file" : "/system/core/liblog/include/log/log_time.h",
    "unique_id" : "log_time"
   },
   {
@@ -49318,7 +49318,7 @@
    "referenced_type" : "type-2742",
    "self_type" : "type-2742",
    "size" : 20,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
   },
   {
@@ -49370,7 +49370,7 @@
    "referenced_type" : "type-2763",
    "self_type" : "type-2763",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
   },
   {
@@ -49422,7 +49422,7 @@
    "referenced_type" : "type-2775",
    "self_type" : "type-2775",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
   },
   {
@@ -49479,7 +49479,7 @@
    "referenced_type" : "type-2778",
    "self_type" : "type-2778",
    "size" : 28,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h",
+   "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
   },
   {
diff --git a/29/64/x86_x86_64/source-based/libstdc++.so.lsdump b/29/64/x86_x86_64/source-based/libstdc++.so.lsdump
index 739ceb0..8694323 100644
--- a/29/64/x86_x86_64/source-based/libstdc++.so.lsdump
+++ b/29/64/x86_x86_64/source-based/libstdc++.so.lsdump
@@ -495,7 +495,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-106",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-7",
    "unique_id" : "android_LogPriority"
   },
@@ -549,7 +549,7 @@
    "referenced_type" : "type-107",
    "self_type" : "type-107",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h",
+   "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-7",
    "unique_id" : "log_id"
   },
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 e2beb0c..e5a1275 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
@@ -10,14 +10,14 @@
    "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"
   },
   {
    "linker_set_key" : "_ZTIA_c",
    "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" :
@@ -385,7 +385,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"
   },
   {
@@ -434,7 +434,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"
   },
   {
@@ -523,7 +523,7 @@
    "referenced_type" : "_ZTI21AndroidLogPrintFormat",
    "self_type" : "_ZTI21AndroidLogPrintFormat",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -580,7 +580,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"
   }
  ],
@@ -614,7 +614,7 @@
    "referenced_type" : "_ZTIFi6log_idcPKcS1_jPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFi6log_idcPKcS1_jPvE",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -629,7 +629,7 @@
    "referenced_type" : "_ZTIFvPK21__android_log_messageE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPK21__android_log_messageE",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -644,7 +644,7 @@
    "referenced_type" : "_ZTIFvPKcE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKcE",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   }
  ],
  "functions" :
@@ -665,7 +665,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bswrite",
@@ -680,7 +680,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_btwrite",
@@ -701,7 +701,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_buf_print",
@@ -722,7 +722,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_buf_write",
@@ -743,7 +743,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bwrite",
@@ -761,7 +761,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_call_aborter",
@@ -773,13 +773,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_close",
    "linker_set_key" : "__android_log_close",
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_default_aborter",
@@ -791,7 +791,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_error_write",
@@ -815,19 +815,19 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_safetynet.h"
+   "source_file" : "/system/core/liblog/include/log/log_safetynet.h"
   },
   {
    "function_name" : "__android_log_get_minimum_priority",
    "linker_set_key" : "__android_log_get_minimum_priority",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_is_debuggable",
    "linker_set_key" : "__android_log_is_debuggable",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_properties.h"
+   "source_file" : "/system/core/liblog/include/log/log_properties.h"
   },
   {
    "function_name" : "__android_log_is_loggable",
@@ -845,7 +845,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_is_loggable_len",
@@ -866,7 +866,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_logd_logger",
@@ -878,7 +878,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_read",
@@ -902,7 +902,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_write",
@@ -926,7 +926,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_print",
@@ -944,13 +944,13 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_security",
    "linker_set_key" : "__android_log_security",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_security_bswrite",
@@ -965,7 +965,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_set_aborter",
@@ -977,7 +977,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_default_tag",
@@ -989,7 +989,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_logger",
@@ -1001,7 +1001,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_minimum_priority",
@@ -1013,7 +1013,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_stderr_logger",
@@ -1025,7 +1025,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_vprint",
@@ -1046,7 +1046,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write",
@@ -1064,7 +1064,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write_log_message",
@@ -1076,7 +1076,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_logger_get_buffer_size",
@@ -1088,7 +1088,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_logger_property_get_bool",
@@ -1103,7 +1103,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_destroy",
@@ -1115,7 +1115,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_id_to_name",
@@ -1127,7 +1127,7 @@
     }
    ],
    "return_type" : "_ZTIPKc",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_log_parser_reset",
@@ -1145,7 +1145,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_processBinaryLogBuffer",
@@ -1169,7 +1169,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_processLogBuffer",
@@ -1184,7 +1184,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_read_next",
@@ -1196,7 +1196,7 @@
     }
    ],
    "return_type" : "_ZTI24android_log_list_element",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_reset",
@@ -1208,7 +1208,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_float32",
@@ -1223,7 +1223,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int32",
@@ -1238,7 +1238,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int64",
@@ -1253,7 +1253,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list",
@@ -1268,7 +1268,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_begin",
@@ -1280,7 +1280,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_buffer",
@@ -1295,7 +1295,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_write_list_end",
@@ -1307,7 +1307,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8",
@@ -1322,7 +1322,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8_len",
@@ -1340,7 +1340,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_logger_clear",
@@ -1352,7 +1352,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_id",
@@ -1364,7 +1364,7 @@
     }
    ],
    "return_type" : "_ZTI6log_id",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_readable_size",
@@ -1376,7 +1376,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_size",
@@ -1388,7 +1388,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_version",
@@ -1400,7 +1400,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_prune_list",
@@ -1418,7 +1418,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_statistics",
@@ -1436,7 +1436,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc",
@@ -1454,7 +1454,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc_time",
@@ -1472,7 +1472,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_free",
@@ -1484,7 +1484,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_open",
@@ -1505,7 +1505,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_read",
@@ -1520,7 +1520,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_open",
@@ -1535,7 +1535,7 @@
     }
    ],
    "return_type" : "_ZTIP6logger",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_log_size",
@@ -1550,7 +1550,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_prune_list",
@@ -1568,7 +1568,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_lookupEventTagNum",
@@ -1589,7 +1589,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "android_name_to_log_id",
@@ -1601,7 +1601,7 @@
     }
    ],
    "return_type" : "_ZTI6log_id",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_openEventTagMap",
@@ -1613,7 +1613,7 @@
     }
    ],
    "return_type" : "_ZTIP11EventTagMap",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "create_android_log_parser",
@@ -1628,7 +1628,7 @@
     }
    ],
    "return_type" : "_ZTIP28android_log_context_internal",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "create_android_logger",
@@ -1640,7 +1640,7 @@
     }
    ],
    "return_type" : "_ZTIP28android_log_context_internal",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "global_vars" : [],
@@ -1653,7 +1653,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIR22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1662,7 +1662,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,
@@ -1671,7 +1671,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,
@@ -1680,7 +1680,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,
@@ -1689,7 +1689,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "pointer_types" :
@@ -1701,7 +1701,7 @@
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIP11EventTagMap",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -1710,7 +1710,7 @@
    "referenced_type" : "_ZTI11logger_list",
    "self_type" : "_ZTIP11logger_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1719,7 +1719,7 @@
    "referenced_type" : "_ZTI12logger_entry",
    "self_type" : "_ZTIP12logger_entry",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1728,7 +1728,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTIP17AndroidLogEntry_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1737,7 +1737,7 @@
    "referenced_type" : "_ZTI18AndroidLogFormat_t",
    "self_type" : "_ZTIP18AndroidLogFormat_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1746,7 +1746,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTIP21__android_log_message",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1755,7 +1755,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIP22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1764,7 +1764,7 @@
    "referenced_type" : "_ZTI28android_log_context_internal",
    "self_type" : "_ZTIP28android_log_context_internal",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1773,7 +1773,7 @@
    "referenced_type" : "_ZTI6logger",
    "self_type" : "_ZTIP6logger",
    "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" : "_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,
@@ -1791,7 +1791,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,
@@ -1800,7 +1800,7 @@
    "referenced_type" : "_ZTIFi6log_idcPKcS1_jPvE",
    "self_type" : "_ZTIPFi6log_idcPKcS1_jPvE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -1809,7 +1809,7 @@
    "referenced_type" : "_ZTIFvPK21__android_log_messageE",
    "self_type" : "_ZTIPFvPK21__android_log_messageE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1818,7 +1818,7 @@
    "referenced_type" : "_ZTIFvPKcE",
    "self_type" : "_ZTIPFvPKcE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1827,7 +1827,7 @@
    "referenced_type" : "_ZTIK11EventTagMap",
    "self_type" : "_ZTIPK11EventTagMap",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1836,7 +1836,7 @@
    "referenced_type" : "_ZTIK17AndroidLogEntry_t",
    "self_type" : "_ZTIPK17AndroidLogEntry_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1845,7 +1845,7 @@
    "referenced_type" : "_ZTIK21__android_log_message",
    "self_type" : "_ZTIPK21__android_log_message",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1854,7 +1854,7 @@
    "referenced_type" : "_ZTIK22android_log_event_list",
    "self_type" : "_ZTIPK22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1863,7 +1863,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,
@@ -1872,7 +1872,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,
@@ -1881,7 +1881,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1890,7 +1890,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "alignment" : 4,
@@ -1899,7 +1899,7 @@
    "referenced_type" : "_ZTIP28android_log_context_internal",
    "self_type" : "_ZTIPP28android_log_context_internal",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1908,7 +1908,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -1917,7 +1917,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1926,7 +1926,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1935,7 +1935,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "qualified_types" :
@@ -1946,7 +1946,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"
   },
   {
    "is_const" : true,
@@ -1954,7 +1954,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIK11EventTagMap",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1964,7 +1964,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTIK17AndroidLogEntry_t",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1974,7 +1974,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTIK21__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,
@@ -1984,7 +1984,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIK22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1994,7 +1994,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,
@@ -2004,7 +2004,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,
@@ -2014,7 +2014,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,
@@ -2024,7 +2024,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2034,7 +2034,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -2044,7 +2044,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"
   },
   {
    "is_const" : true,
@@ -2052,7 +2052,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   }
  ],
  "record_types" :
@@ -2106,7 +2106,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,
@@ -2167,7 +2167,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTI17AndroidLogEntry_t",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 1,
@@ -2188,7 +2188,7 @@
    "referenced_type" : "_ZTI19android_event_int_t",
    "self_type" : "_ZTI19android_event_int_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2209,7 +2209,7 @@
    "referenced_type" : "_ZTI20android_event_list_t",
    "self_type" : "_ZTI20android_event_list_t",
    "size" : 2,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2230,7 +2230,7 @@
    "referenced_type" : "_ZTI20android_event_long_t",
    "self_type" : "_ZTI20android_event_long_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2256,7 +2256,7 @@
    "referenced_type" : "_ZTI20android_log_header_t",
    "self_type" : "_ZTI20android_log_header_t",
    "size" : 11,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2302,7 +2302,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" : 1,
@@ -2323,7 +2323,7 @@
    "referenced_type" : "_ZTI21android_event_float_t",
    "self_type" : "_ZTI21android_event_float_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2339,7 +2339,7 @@
    "referenced_type" : "_ZTI22android_event_header_t",
    "self_type" : "_ZTI22android_event_header_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2365,7 +2365,7 @@
    "referenced_type" : "_ZTI22android_event_string_t",
    "self_type" : "_ZTI22android_event_string_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2389,7 +2389,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTI22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2410,7 +2410,7 @@
    "referenced_type" : "_ZTI23android_log_event_int_t",
    "self_type" : "_ZTI23android_log_event_int_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2431,7 +2431,7 @@
    "referenced_type" : "_ZTI24android_log_event_long_t",
    "self_type" : "_ZTI24android_log_event_long_t",
    "size" : 13,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -2462,7 +2462,7 @@
    "referenced_type" : "_ZTI24android_log_list_element",
    "self_type" : "_ZTI24android_log_list_element",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2493,7 +2493,7 @@
    "referenced_type" : "_ZTI25android_pmsg_log_header_t",
    "self_type" : "_ZTI25android_pmsg_log_header_t",
    "size" : 7,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2524,7 +2524,7 @@
    "referenced_type" : "_ZTI26android_log_event_string_t",
    "self_type" : "_ZTI26android_log_event_string_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2539,7 +2539,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" : 1,
@@ -2560,7 +2560,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,
@@ -2585,12 +2585,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN24android_log_list_elementUt_E",
-   "name" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:48:3)",
+   "name" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:48:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN24android_log_list_elementUt_E",
    "self_type" : "_ZTIN24android_log_list_elementUt_E",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2607,12 +2607,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"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/30/32/x86/source-based/liblog.so.lsdump b/30/32/x86/source-based/liblog.so.lsdump
index 082840f..e0c66af 100644
--- a/30/32/x86/source-based/liblog.so.lsdump
+++ b/30/32/x86/source-based/liblog.so.lsdump
@@ -10,14 +10,14 @@
    "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"
   },
   {
    "linker_set_key" : "_ZTIA_c",
    "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" :
@@ -384,7 +384,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"
   },
   {
@@ -433,7 +433,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"
   },
   {
@@ -522,7 +522,7 @@
    "referenced_type" : "_ZTI21AndroidLogPrintFormat",
    "self_type" : "_ZTI21AndroidLogPrintFormat",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -579,7 +579,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"
   }
  ],
@@ -613,7 +613,7 @@
    "referenced_type" : "_ZTIFi6log_idcPKcS1_jPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFi6log_idcPKcS1_jPvE",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -628,7 +628,7 @@
    "referenced_type" : "_ZTIFvPK21__android_log_messageE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPK21__android_log_messageE",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -643,7 +643,7 @@
    "referenced_type" : "_ZTIFvPKcE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKcE",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   }
  ],
  "functions" :
@@ -664,7 +664,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bswrite",
@@ -679,7 +679,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_btwrite",
@@ -700,7 +700,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_buf_print",
@@ -721,7 +721,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_buf_write",
@@ -742,7 +742,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bwrite",
@@ -760,7 +760,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_call_aborter",
@@ -772,13 +772,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_close",
    "linker_set_key" : "__android_log_close",
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_default_aborter",
@@ -790,7 +790,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_error_write",
@@ -814,19 +814,19 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_safetynet.h"
+   "source_file" : "/system/core/liblog/include/log/log_safetynet.h"
   },
   {
    "function_name" : "__android_log_get_minimum_priority",
    "linker_set_key" : "__android_log_get_minimum_priority",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_is_debuggable",
    "linker_set_key" : "__android_log_is_debuggable",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_properties.h"
+   "source_file" : "/system/core/liblog/include/log/log_properties.h"
   },
   {
    "function_name" : "__android_log_is_loggable",
@@ -844,7 +844,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_is_loggable_len",
@@ -865,7 +865,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_logd_logger",
@@ -877,7 +877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_read",
@@ -901,7 +901,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_write",
@@ -925,7 +925,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_print",
@@ -943,13 +943,13 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_security",
    "linker_set_key" : "__android_log_security",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_security_bswrite",
@@ -964,7 +964,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_set_aborter",
@@ -976,7 +976,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_default_tag",
@@ -988,7 +988,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_logger",
@@ -1000,7 +1000,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_minimum_priority",
@@ -1012,7 +1012,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_stderr_logger",
@@ -1024,7 +1024,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_vprint",
@@ -1045,7 +1045,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write",
@@ -1063,7 +1063,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write_log_message",
@@ -1075,7 +1075,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_logger_get_buffer_size",
@@ -1087,7 +1087,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_logger_property_get_bool",
@@ -1102,7 +1102,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_destroy",
@@ -1114,7 +1114,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_id_to_name",
@@ -1126,7 +1126,7 @@
     }
    ],
    "return_type" : "_ZTIPKc",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_log_parser_reset",
@@ -1144,7 +1144,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_processBinaryLogBuffer",
@@ -1168,7 +1168,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_processLogBuffer",
@@ -1183,7 +1183,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_read_next",
@@ -1195,7 +1195,7 @@
     }
    ],
    "return_type" : "_ZTI24android_log_list_element",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_reset",
@@ -1207,7 +1207,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_float32",
@@ -1222,7 +1222,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int32",
@@ -1237,7 +1237,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int64",
@@ -1252,7 +1252,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list",
@@ -1267,7 +1267,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_begin",
@@ -1279,7 +1279,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_buffer",
@@ -1294,7 +1294,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_write_list_end",
@@ -1306,7 +1306,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8",
@@ -1321,7 +1321,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8_len",
@@ -1339,7 +1339,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_logger_clear",
@@ -1351,7 +1351,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_id",
@@ -1363,7 +1363,7 @@
     }
    ],
    "return_type" : "_ZTI6log_id",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_readable_size",
@@ -1375,7 +1375,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_size",
@@ -1387,7 +1387,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_version",
@@ -1399,7 +1399,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_prune_list",
@@ -1417,7 +1417,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_statistics",
@@ -1435,7 +1435,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc",
@@ -1453,7 +1453,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc_time",
@@ -1471,7 +1471,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_free",
@@ -1483,7 +1483,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_open",
@@ -1504,7 +1504,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_read",
@@ -1519,7 +1519,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_open",
@@ -1534,7 +1534,7 @@
     }
    ],
    "return_type" : "_ZTIP6logger",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_log_size",
@@ -1549,7 +1549,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_prune_list",
@@ -1567,7 +1567,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_lookupEventTagNum",
@@ -1588,7 +1588,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "android_name_to_log_id",
@@ -1600,7 +1600,7 @@
     }
    ],
    "return_type" : "_ZTI6log_id",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_openEventTagMap",
@@ -1612,7 +1612,7 @@
     }
    ],
    "return_type" : "_ZTIP11EventTagMap",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "create_android_log_parser",
@@ -1627,7 +1627,7 @@
     }
    ],
    "return_type" : "_ZTIP28android_log_context_internal",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "create_android_logger",
@@ -1639,7 +1639,7 @@
     }
    ],
    "return_type" : "_ZTIP28android_log_context_internal",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "global_vars" : [],
@@ -1652,7 +1652,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIR22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1661,7 +1661,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,
@@ -1670,7 +1670,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,
@@ -1679,7 +1679,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,
@@ -1688,7 +1688,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "pointer_types" :
@@ -1700,7 +1700,7 @@
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIP11EventTagMap",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -1709,7 +1709,7 @@
    "referenced_type" : "_ZTI11logger_list",
    "self_type" : "_ZTIP11logger_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1718,7 +1718,7 @@
    "referenced_type" : "_ZTI12logger_entry",
    "self_type" : "_ZTIP12logger_entry",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1727,7 +1727,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTIP17AndroidLogEntry_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1736,7 +1736,7 @@
    "referenced_type" : "_ZTI18AndroidLogFormat_t",
    "self_type" : "_ZTIP18AndroidLogFormat_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1745,7 +1745,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTIP21__android_log_message",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1754,7 +1754,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIP22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1763,7 +1763,7 @@
    "referenced_type" : "_ZTI28android_log_context_internal",
    "self_type" : "_ZTIP28android_log_context_internal",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1772,7 +1772,7 @@
    "referenced_type" : "_ZTI6logger",
    "self_type" : "_ZTIP6logger",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1781,7 +1781,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,
@@ -1790,7 +1790,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,
@@ -1799,7 +1799,7 @@
    "referenced_type" : "_ZTIFi6log_idcPKcS1_jPvE",
    "self_type" : "_ZTIPFi6log_idcPKcS1_jPvE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -1808,7 +1808,7 @@
    "referenced_type" : "_ZTIFvPK21__android_log_messageE",
    "self_type" : "_ZTIPFvPK21__android_log_messageE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1817,7 +1817,7 @@
    "referenced_type" : "_ZTIFvPKcE",
    "self_type" : "_ZTIPFvPKcE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1826,7 +1826,7 @@
    "referenced_type" : "_ZTIK11EventTagMap",
    "self_type" : "_ZTIPK11EventTagMap",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1835,7 +1835,7 @@
    "referenced_type" : "_ZTIK17AndroidLogEntry_t",
    "self_type" : "_ZTIPK17AndroidLogEntry_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1844,7 +1844,7 @@
    "referenced_type" : "_ZTIK21__android_log_message",
    "self_type" : "_ZTIPK21__android_log_message",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1853,7 +1853,7 @@
    "referenced_type" : "_ZTIK22android_log_event_list",
    "self_type" : "_ZTIPK22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1862,7 +1862,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,
@@ -1871,7 +1871,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,
@@ -1880,7 +1880,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1889,7 +1889,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "alignment" : 4,
@@ -1898,7 +1898,7 @@
    "referenced_type" : "_ZTIP28android_log_context_internal",
    "self_type" : "_ZTIPP28android_log_context_internal",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1907,7 +1907,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -1916,7 +1916,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1925,7 +1925,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1934,7 +1934,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "qualified_types" :
@@ -1945,7 +1945,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"
   },
   {
    "is_const" : true,
@@ -1953,7 +1953,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIK11EventTagMap",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1963,7 +1963,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTIK17AndroidLogEntry_t",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1973,7 +1973,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTIK21__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,
@@ -1983,7 +1983,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIK22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1993,7 +1993,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,
@@ -2003,7 +2003,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,
@@ -2013,7 +2013,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,
@@ -2023,7 +2023,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2033,7 +2033,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -2043,7 +2043,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"
   },
   {
    "is_const" : true,
@@ -2051,7 +2051,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   }
  ],
  "record_types" :
@@ -2105,7 +2105,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,
@@ -2166,7 +2166,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTI17AndroidLogEntry_t",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 1,
@@ -2187,7 +2187,7 @@
    "referenced_type" : "_ZTI19android_event_int_t",
    "self_type" : "_ZTI19android_event_int_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2208,7 +2208,7 @@
    "referenced_type" : "_ZTI20android_event_list_t",
    "self_type" : "_ZTI20android_event_list_t",
    "size" : 2,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2229,7 +2229,7 @@
    "referenced_type" : "_ZTI20android_event_long_t",
    "self_type" : "_ZTI20android_event_long_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2255,7 +2255,7 @@
    "referenced_type" : "_ZTI20android_log_header_t",
    "self_type" : "_ZTI20android_log_header_t",
    "size" : 11,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2301,7 +2301,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" : 1,
@@ -2322,7 +2322,7 @@
    "referenced_type" : "_ZTI21android_event_float_t",
    "self_type" : "_ZTI21android_event_float_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2338,7 +2338,7 @@
    "referenced_type" : "_ZTI22android_event_header_t",
    "self_type" : "_ZTI22android_event_header_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2364,7 +2364,7 @@
    "referenced_type" : "_ZTI22android_event_string_t",
    "self_type" : "_ZTI22android_event_string_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2388,7 +2388,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTI22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2409,7 +2409,7 @@
    "referenced_type" : "_ZTI23android_log_event_int_t",
    "self_type" : "_ZTI23android_log_event_int_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2430,7 +2430,7 @@
    "referenced_type" : "_ZTI24android_log_event_long_t",
    "self_type" : "_ZTI24android_log_event_long_t",
    "size" : 13,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2461,7 +2461,7 @@
    "referenced_type" : "_ZTI24android_log_list_element",
    "self_type" : "_ZTI24android_log_list_element",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2492,7 +2492,7 @@
    "referenced_type" : "_ZTI25android_pmsg_log_header_t",
    "self_type" : "_ZTI25android_pmsg_log_header_t",
    "size" : 7,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2523,7 +2523,7 @@
    "referenced_type" : "_ZTI26android_log_event_string_t",
    "self_type" : "_ZTI26android_log_event_string_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2538,7 +2538,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" : 1,
@@ -2559,7 +2559,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,
@@ -2584,12 +2584,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN24android_log_list_elementUt_E",
-   "name" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:48:3)",
+   "name" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:48:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN24android_log_list_elementUt_E",
    "self_type" : "_ZTIN24android_log_list_elementUt_E",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2606,12 +2606,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"
   }
  ],
  "rvalue_reference_types" : []
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 3926ec3..e2e7124 100644
--- a/30/64/arm64_armv8-a/source-based/liblog.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/liblog.so.lsdump
@@ -10,14 +10,14 @@
    "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"
   },
   {
    "linker_set_key" : "_ZTIA_c",
    "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" :
@@ -366,7 +366,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"
   },
   {
@@ -415,7 +415,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"
   },
   {
@@ -504,7 +504,7 @@
    "referenced_type" : "_ZTI21AndroidLogPrintFormat",
    "self_type" : "_ZTI21AndroidLogPrintFormat",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -561,7 +561,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"
   }
  ],
@@ -595,7 +595,7 @@
    "referenced_type" : "_ZTIFl6log_idcPKcS1_mPvE",
    "return_type" : "_ZTIl",
    "self_type" : "_ZTIFl6log_idcPKcS1_mPvE",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -610,7 +610,7 @@
    "referenced_type" : "_ZTIFvPK21__android_log_messageE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPK21__android_log_messageE",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -625,7 +625,7 @@
    "referenced_type" : "_ZTIFvPKcE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKcE",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   }
  ],
  "functions" :
@@ -646,7 +646,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bswrite",
@@ -661,7 +661,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_btwrite",
@@ -682,7 +682,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_buf_print",
@@ -703,7 +703,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_buf_write",
@@ -724,7 +724,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bwrite",
@@ -742,7 +742,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_call_aborter",
@@ -754,13 +754,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_close",
    "linker_set_key" : "__android_log_close",
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_default_aborter",
@@ -772,7 +772,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_error_write",
@@ -796,19 +796,19 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_safetynet.h"
+   "source_file" : "/system/core/liblog/include/log/log_safetynet.h"
   },
   {
    "function_name" : "__android_log_get_minimum_priority",
    "linker_set_key" : "__android_log_get_minimum_priority",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_is_debuggable",
    "linker_set_key" : "__android_log_is_debuggable",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_properties.h"
+   "source_file" : "/system/core/liblog/include/log/log_properties.h"
   },
   {
    "function_name" : "__android_log_is_loggable",
@@ -826,7 +826,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_is_loggable_len",
@@ -847,7 +847,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_logd_logger",
@@ -859,7 +859,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_read",
@@ -883,7 +883,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_write",
@@ -907,7 +907,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_print",
@@ -925,13 +925,13 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_security",
    "linker_set_key" : "__android_log_security",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_security_bswrite",
@@ -946,7 +946,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_set_aborter",
@@ -958,7 +958,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_default_tag",
@@ -970,7 +970,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_logger",
@@ -982,7 +982,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_minimum_priority",
@@ -994,7 +994,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_stderr_logger",
@@ -1006,7 +1006,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_vprint",
@@ -1027,7 +1027,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write",
@@ -1045,7 +1045,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write_log_message",
@@ -1057,7 +1057,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_logger_get_buffer_size",
@@ -1069,7 +1069,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_logger_property_get_bool",
@@ -1084,7 +1084,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_destroy",
@@ -1096,7 +1096,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_id_to_name",
@@ -1108,7 +1108,7 @@
     }
    ],
    "return_type" : "_ZTIPKc",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_log_parser_reset",
@@ -1126,7 +1126,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_processBinaryLogBuffer",
@@ -1150,7 +1150,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_processLogBuffer",
@@ -1165,7 +1165,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_read_next",
@@ -1177,7 +1177,7 @@
     }
    ],
    "return_type" : "_ZTI24android_log_list_element",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_reset",
@@ -1189,7 +1189,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_float32",
@@ -1204,7 +1204,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int32",
@@ -1219,7 +1219,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int64",
@@ -1234,7 +1234,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list",
@@ -1249,7 +1249,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_begin",
@@ -1261,7 +1261,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_buffer",
@@ -1276,7 +1276,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_write_list_end",
@@ -1288,7 +1288,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8",
@@ -1303,7 +1303,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8_len",
@@ -1321,7 +1321,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_logger_clear",
@@ -1333,7 +1333,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_id",
@@ -1345,7 +1345,7 @@
     }
    ],
    "return_type" : "_ZTI6log_id",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_readable_size",
@@ -1357,7 +1357,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_size",
@@ -1369,7 +1369,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_version",
@@ -1381,7 +1381,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_prune_list",
@@ -1399,7 +1399,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_statistics",
@@ -1417,7 +1417,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc",
@@ -1435,7 +1435,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc_time",
@@ -1453,7 +1453,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_free",
@@ -1465,7 +1465,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_open",
@@ -1486,7 +1486,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_read",
@@ -1501,7 +1501,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_open",
@@ -1516,7 +1516,7 @@
     }
    ],
    "return_type" : "_ZTIP6logger",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_log_size",
@@ -1531,7 +1531,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_prune_list",
@@ -1549,7 +1549,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_lookupEventTagNum",
@@ -1570,7 +1570,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "android_name_to_log_id",
@@ -1582,7 +1582,7 @@
     }
    ],
    "return_type" : "_ZTI6log_id",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_openEventTagMap",
@@ -1594,7 +1594,7 @@
     }
    ],
    "return_type" : "_ZTIP11EventTagMap",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "create_android_log_parser",
@@ -1609,7 +1609,7 @@
     }
    ],
    "return_type" : "_ZTIP28android_log_context_internal",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "create_android_logger",
@@ -1621,7 +1621,7 @@
     }
    ],
    "return_type" : "_ZTIP28android_log_context_internal",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "global_vars" : [],
@@ -1634,7 +1634,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIR22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1643,7 +1643,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,
@@ -1652,7 +1652,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,
@@ -1661,7 +1661,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,
@@ -1670,7 +1670,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "pointer_types" :
@@ -1682,7 +1682,7 @@
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIP11EventTagMap",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 8,
@@ -1691,7 +1691,7 @@
    "referenced_type" : "_ZTI11logger_list",
    "self_type" : "_ZTIP11logger_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -1700,7 +1700,7 @@
    "referenced_type" : "_ZTI12logger_entry",
    "self_type" : "_ZTIP12logger_entry",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -1709,7 +1709,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTIP17AndroidLogEntry_t",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -1718,7 +1718,7 @@
    "referenced_type" : "_ZTI18AndroidLogFormat_t",
    "self_type" : "_ZTIP18AndroidLogFormat_t",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -1727,7 +1727,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTIP21__android_log_message",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 8,
@@ -1736,7 +1736,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIP22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1745,7 +1745,7 @@
    "referenced_type" : "_ZTI28android_log_context_internal",
    "self_type" : "_ZTIP28android_log_context_internal",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1754,7 +1754,7 @@
    "referenced_type" : "_ZTI6logger",
    "self_type" : "_ZTIP6logger",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -1763,7 +1763,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,
@@ -1772,7 +1772,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,
@@ -1781,7 +1781,7 @@
    "referenced_type" : "_ZTIFl6log_idcPKcS1_mPvE",
    "self_type" : "_ZTIPFl6log_idcPKcS1_mPvE",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -1790,7 +1790,7 @@
    "referenced_type" : "_ZTIFvPK21__android_log_messageE",
    "self_type" : "_ZTIPFvPK21__android_log_messageE",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 8,
@@ -1799,7 +1799,7 @@
    "referenced_type" : "_ZTIFvPKcE",
    "self_type" : "_ZTIPFvPKcE",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 8,
@@ -1808,7 +1808,7 @@
    "referenced_type" : "_ZTIK11EventTagMap",
    "self_type" : "_ZTIPK11EventTagMap",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -1817,7 +1817,7 @@
    "referenced_type" : "_ZTIK17AndroidLogEntry_t",
    "self_type" : "_ZTIPK17AndroidLogEntry_t",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -1826,7 +1826,7 @@
    "referenced_type" : "_ZTIK21__android_log_message",
    "self_type" : "_ZTIPK21__android_log_message",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 8,
@@ -1835,7 +1835,7 @@
    "referenced_type" : "_ZTIK22android_log_event_list",
    "self_type" : "_ZTIPK22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1844,7 +1844,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,
@@ -1853,7 +1853,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,
@@ -1862,7 +1862,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 8,
@@ -1871,7 +1871,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "alignment" : 8,
@@ -1880,7 +1880,7 @@
    "referenced_type" : "_ZTIP28android_log_context_internal",
    "self_type" : "_ZTIPP28android_log_context_internal",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1889,7 +1889,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -1898,7 +1898,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -1907,7 +1907,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIPm",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -1916,7 +1916,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "qualified_types" :
@@ -1927,7 +1927,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"
   },
   {
    "is_const" : true,
@@ -1935,7 +1935,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIK11EventTagMap",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -1945,7 +1945,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTIK17AndroidLogEntry_t",
    "size" : 64,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -1955,7 +1955,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTIK21__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,
@@ -1965,7 +1965,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIK22android_log_event_list",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1975,7 +1975,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,
@@ -1985,7 +1985,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,
@@ -1995,7 +1995,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" : 8,
@@ -2005,7 +2005,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2015,7 +2015,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -2025,7 +2025,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"
   },
   {
    "is_const" : true,
@@ -2033,7 +2033,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   }
  ],
  "record_types" :
@@ -2087,7 +2087,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,
@@ -2148,7 +2148,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTI17AndroidLogEntry_t",
    "size" : 64,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 1,
@@ -2169,7 +2169,7 @@
    "referenced_type" : "_ZTI19android_event_int_t",
    "self_type" : "_ZTI19android_event_int_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2190,7 +2190,7 @@
    "referenced_type" : "_ZTI20android_event_list_t",
    "self_type" : "_ZTI20android_event_list_t",
    "size" : 2,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2211,7 +2211,7 @@
    "referenced_type" : "_ZTI20android_event_long_t",
    "self_type" : "_ZTI20android_event_long_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2237,7 +2237,7 @@
    "referenced_type" : "_ZTI20android_log_header_t",
    "self_type" : "_ZTI20android_log_header_t",
    "size" : 11,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -2283,7 +2283,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" : 1,
@@ -2304,7 +2304,7 @@
    "referenced_type" : "_ZTI21android_event_float_t",
    "self_type" : "_ZTI21android_event_float_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2320,7 +2320,7 @@
    "referenced_type" : "_ZTI22android_event_header_t",
    "self_type" : "_ZTI22android_event_header_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2346,7 +2346,7 @@
    "referenced_type" : "_ZTI22android_event_string_t",
    "self_type" : "_ZTI22android_event_string_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -2370,7 +2370,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTI22android_log_event_list",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2391,7 +2391,7 @@
    "referenced_type" : "_ZTI23android_log_event_int_t",
    "self_type" : "_ZTI23android_log_event_int_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2412,7 +2412,7 @@
    "referenced_type" : "_ZTI24android_log_event_long_t",
    "self_type" : "_ZTI24android_log_event_long_t",
    "size" : 13,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -2443,7 +2443,7 @@
    "referenced_type" : "_ZTI24android_log_list_element",
    "self_type" : "_ZTI24android_log_list_element",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2474,7 +2474,7 @@
    "referenced_type" : "_ZTI25android_pmsg_log_header_t",
    "self_type" : "_ZTI25android_pmsg_log_header_t",
    "size" : 7,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2505,7 +2505,7 @@
    "referenced_type" : "_ZTI26android_log_event_string_t",
    "self_type" : "_ZTI26android_log_event_string_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2520,7 +2520,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" : 1,
@@ -2541,7 +2541,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,
@@ -2566,12 +2566,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN24android_log_list_elementUt_E",
-   "name" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:48:3)",
+   "name" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:48:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN24android_log_list_elementUt_E",
    "self_type" : "_ZTIN24android_log_list_elementUt_E",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2588,12 +2588,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"
   }
  ],
  "rvalue_reference_types" : []
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 e2beb0c..e5a1275 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
@@ -10,14 +10,14 @@
    "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"
   },
   {
    "linker_set_key" : "_ZTIA_c",
    "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" :
@@ -385,7 +385,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"
   },
   {
@@ -434,7 +434,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"
   },
   {
@@ -523,7 +523,7 @@
    "referenced_type" : "_ZTI21AndroidLogPrintFormat",
    "self_type" : "_ZTI21AndroidLogPrintFormat",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -580,7 +580,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"
   }
  ],
@@ -614,7 +614,7 @@
    "referenced_type" : "_ZTIFi6log_idcPKcS1_jPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFi6log_idcPKcS1_jPvE",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -629,7 +629,7 @@
    "referenced_type" : "_ZTIFvPK21__android_log_messageE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPK21__android_log_messageE",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -644,7 +644,7 @@
    "referenced_type" : "_ZTIFvPKcE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKcE",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   }
  ],
  "functions" :
@@ -665,7 +665,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bswrite",
@@ -680,7 +680,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_btwrite",
@@ -701,7 +701,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_buf_print",
@@ -722,7 +722,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_buf_write",
@@ -743,7 +743,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bwrite",
@@ -761,7 +761,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_call_aborter",
@@ -773,13 +773,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_close",
    "linker_set_key" : "__android_log_close",
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_default_aborter",
@@ -791,7 +791,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_error_write",
@@ -815,19 +815,19 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_safetynet.h"
+   "source_file" : "/system/core/liblog/include/log/log_safetynet.h"
   },
   {
    "function_name" : "__android_log_get_minimum_priority",
    "linker_set_key" : "__android_log_get_minimum_priority",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_is_debuggable",
    "linker_set_key" : "__android_log_is_debuggable",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_properties.h"
+   "source_file" : "/system/core/liblog/include/log/log_properties.h"
   },
   {
    "function_name" : "__android_log_is_loggable",
@@ -845,7 +845,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_is_loggable_len",
@@ -866,7 +866,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_logd_logger",
@@ -878,7 +878,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_read",
@@ -902,7 +902,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_write",
@@ -926,7 +926,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_print",
@@ -944,13 +944,13 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_security",
    "linker_set_key" : "__android_log_security",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_security_bswrite",
@@ -965,7 +965,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_set_aborter",
@@ -977,7 +977,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_default_tag",
@@ -989,7 +989,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_logger",
@@ -1001,7 +1001,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_minimum_priority",
@@ -1013,7 +1013,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_stderr_logger",
@@ -1025,7 +1025,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_vprint",
@@ -1046,7 +1046,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write",
@@ -1064,7 +1064,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write_log_message",
@@ -1076,7 +1076,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_logger_get_buffer_size",
@@ -1088,7 +1088,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_logger_property_get_bool",
@@ -1103,7 +1103,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_destroy",
@@ -1115,7 +1115,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_id_to_name",
@@ -1127,7 +1127,7 @@
     }
    ],
    "return_type" : "_ZTIPKc",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_log_parser_reset",
@@ -1145,7 +1145,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_processBinaryLogBuffer",
@@ -1169,7 +1169,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_processLogBuffer",
@@ -1184,7 +1184,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_read_next",
@@ -1196,7 +1196,7 @@
     }
    ],
    "return_type" : "_ZTI24android_log_list_element",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_reset",
@@ -1208,7 +1208,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_float32",
@@ -1223,7 +1223,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int32",
@@ -1238,7 +1238,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int64",
@@ -1253,7 +1253,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list",
@@ -1268,7 +1268,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_begin",
@@ -1280,7 +1280,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_buffer",
@@ -1295,7 +1295,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_write_list_end",
@@ -1307,7 +1307,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8",
@@ -1322,7 +1322,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8_len",
@@ -1340,7 +1340,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_logger_clear",
@@ -1352,7 +1352,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_id",
@@ -1364,7 +1364,7 @@
     }
    ],
    "return_type" : "_ZTI6log_id",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_readable_size",
@@ -1376,7 +1376,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_size",
@@ -1388,7 +1388,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_version",
@@ -1400,7 +1400,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_prune_list",
@@ -1418,7 +1418,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_statistics",
@@ -1436,7 +1436,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc",
@@ -1454,7 +1454,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc_time",
@@ -1472,7 +1472,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_free",
@@ -1484,7 +1484,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_open",
@@ -1505,7 +1505,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_read",
@@ -1520,7 +1520,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_open",
@@ -1535,7 +1535,7 @@
     }
    ],
    "return_type" : "_ZTIP6logger",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_log_size",
@@ -1550,7 +1550,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_prune_list",
@@ -1568,7 +1568,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_lookupEventTagNum",
@@ -1589,7 +1589,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "android_name_to_log_id",
@@ -1601,7 +1601,7 @@
     }
    ],
    "return_type" : "_ZTI6log_id",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_openEventTagMap",
@@ -1613,7 +1613,7 @@
     }
    ],
    "return_type" : "_ZTIP11EventTagMap",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "create_android_log_parser",
@@ -1628,7 +1628,7 @@
     }
    ],
    "return_type" : "_ZTIP28android_log_context_internal",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "create_android_logger",
@@ -1640,7 +1640,7 @@
     }
    ],
    "return_type" : "_ZTIP28android_log_context_internal",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "global_vars" : [],
@@ -1653,7 +1653,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIR22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1662,7 +1662,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,
@@ -1671,7 +1671,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,
@@ -1680,7 +1680,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,
@@ -1689,7 +1689,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "pointer_types" :
@@ -1701,7 +1701,7 @@
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIP11EventTagMap",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -1710,7 +1710,7 @@
    "referenced_type" : "_ZTI11logger_list",
    "self_type" : "_ZTIP11logger_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1719,7 +1719,7 @@
    "referenced_type" : "_ZTI12logger_entry",
    "self_type" : "_ZTIP12logger_entry",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1728,7 +1728,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTIP17AndroidLogEntry_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1737,7 +1737,7 @@
    "referenced_type" : "_ZTI18AndroidLogFormat_t",
    "self_type" : "_ZTIP18AndroidLogFormat_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1746,7 +1746,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTIP21__android_log_message",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1755,7 +1755,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIP22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1764,7 +1764,7 @@
    "referenced_type" : "_ZTI28android_log_context_internal",
    "self_type" : "_ZTIP28android_log_context_internal",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1773,7 +1773,7 @@
    "referenced_type" : "_ZTI6logger",
    "self_type" : "_ZTIP6logger",
    "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" : "_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,
@@ -1791,7 +1791,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,
@@ -1800,7 +1800,7 @@
    "referenced_type" : "_ZTIFi6log_idcPKcS1_jPvE",
    "self_type" : "_ZTIPFi6log_idcPKcS1_jPvE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -1809,7 +1809,7 @@
    "referenced_type" : "_ZTIFvPK21__android_log_messageE",
    "self_type" : "_ZTIPFvPK21__android_log_messageE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1818,7 +1818,7 @@
    "referenced_type" : "_ZTIFvPKcE",
    "self_type" : "_ZTIPFvPKcE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1827,7 +1827,7 @@
    "referenced_type" : "_ZTIK11EventTagMap",
    "self_type" : "_ZTIPK11EventTagMap",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1836,7 +1836,7 @@
    "referenced_type" : "_ZTIK17AndroidLogEntry_t",
    "self_type" : "_ZTIPK17AndroidLogEntry_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1845,7 +1845,7 @@
    "referenced_type" : "_ZTIK21__android_log_message",
    "self_type" : "_ZTIPK21__android_log_message",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1854,7 +1854,7 @@
    "referenced_type" : "_ZTIK22android_log_event_list",
    "self_type" : "_ZTIPK22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1863,7 +1863,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,
@@ -1872,7 +1872,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,
@@ -1881,7 +1881,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1890,7 +1890,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "alignment" : 4,
@@ -1899,7 +1899,7 @@
    "referenced_type" : "_ZTIP28android_log_context_internal",
    "self_type" : "_ZTIPP28android_log_context_internal",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1908,7 +1908,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -1917,7 +1917,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1926,7 +1926,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1935,7 +1935,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "qualified_types" :
@@ -1946,7 +1946,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"
   },
   {
    "is_const" : true,
@@ -1954,7 +1954,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIK11EventTagMap",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1964,7 +1964,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTIK17AndroidLogEntry_t",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1974,7 +1974,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTIK21__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,
@@ -1984,7 +1984,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIK22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1994,7 +1994,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,
@@ -2004,7 +2004,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,
@@ -2014,7 +2014,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,
@@ -2024,7 +2024,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2034,7 +2034,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -2044,7 +2044,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"
   },
   {
    "is_const" : true,
@@ -2052,7 +2052,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   }
  ],
  "record_types" :
@@ -2106,7 +2106,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,
@@ -2167,7 +2167,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTI17AndroidLogEntry_t",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 1,
@@ -2188,7 +2188,7 @@
    "referenced_type" : "_ZTI19android_event_int_t",
    "self_type" : "_ZTI19android_event_int_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2209,7 +2209,7 @@
    "referenced_type" : "_ZTI20android_event_list_t",
    "self_type" : "_ZTI20android_event_list_t",
    "size" : 2,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2230,7 +2230,7 @@
    "referenced_type" : "_ZTI20android_event_long_t",
    "self_type" : "_ZTI20android_event_long_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2256,7 +2256,7 @@
    "referenced_type" : "_ZTI20android_log_header_t",
    "self_type" : "_ZTI20android_log_header_t",
    "size" : 11,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2302,7 +2302,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" : 1,
@@ -2323,7 +2323,7 @@
    "referenced_type" : "_ZTI21android_event_float_t",
    "self_type" : "_ZTI21android_event_float_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2339,7 +2339,7 @@
    "referenced_type" : "_ZTI22android_event_header_t",
    "self_type" : "_ZTI22android_event_header_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2365,7 +2365,7 @@
    "referenced_type" : "_ZTI22android_event_string_t",
    "self_type" : "_ZTI22android_event_string_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2389,7 +2389,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTI22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2410,7 +2410,7 @@
    "referenced_type" : "_ZTI23android_log_event_int_t",
    "self_type" : "_ZTI23android_log_event_int_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2431,7 +2431,7 @@
    "referenced_type" : "_ZTI24android_log_event_long_t",
    "self_type" : "_ZTI24android_log_event_long_t",
    "size" : 13,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -2462,7 +2462,7 @@
    "referenced_type" : "_ZTI24android_log_list_element",
    "self_type" : "_ZTI24android_log_list_element",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2493,7 +2493,7 @@
    "referenced_type" : "_ZTI25android_pmsg_log_header_t",
    "self_type" : "_ZTI25android_pmsg_log_header_t",
    "size" : 7,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2524,7 +2524,7 @@
    "referenced_type" : "_ZTI26android_log_event_string_t",
    "self_type" : "_ZTI26android_log_event_string_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2539,7 +2539,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" : 1,
@@ -2560,7 +2560,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,
@@ -2585,12 +2585,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN24android_log_list_elementUt_E",
-   "name" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:48:3)",
+   "name" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:48:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN24android_log_list_elementUt_E",
    "self_type" : "_ZTIN24android_log_list_elementUt_E",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2607,12 +2607,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"
   }
  ],
  "rvalue_reference_types" : []
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 e2beb0c..e5a1275 100644
--- a/30/64/arm_armv8-a/source-based/liblog.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/liblog.so.lsdump
@@ -10,14 +10,14 @@
    "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"
   },
   {
    "linker_set_key" : "_ZTIA_c",
    "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" :
@@ -385,7 +385,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"
   },
   {
@@ -434,7 +434,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"
   },
   {
@@ -523,7 +523,7 @@
    "referenced_type" : "_ZTI21AndroidLogPrintFormat",
    "self_type" : "_ZTI21AndroidLogPrintFormat",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -580,7 +580,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"
   }
  ],
@@ -614,7 +614,7 @@
    "referenced_type" : "_ZTIFi6log_idcPKcS1_jPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFi6log_idcPKcS1_jPvE",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -629,7 +629,7 @@
    "referenced_type" : "_ZTIFvPK21__android_log_messageE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPK21__android_log_messageE",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -644,7 +644,7 @@
    "referenced_type" : "_ZTIFvPKcE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKcE",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   }
  ],
  "functions" :
@@ -665,7 +665,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bswrite",
@@ -680,7 +680,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_btwrite",
@@ -701,7 +701,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_buf_print",
@@ -722,7 +722,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_buf_write",
@@ -743,7 +743,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bwrite",
@@ -761,7 +761,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_call_aborter",
@@ -773,13 +773,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_close",
    "linker_set_key" : "__android_log_close",
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_default_aborter",
@@ -791,7 +791,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_error_write",
@@ -815,19 +815,19 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_safetynet.h"
+   "source_file" : "/system/core/liblog/include/log/log_safetynet.h"
   },
   {
    "function_name" : "__android_log_get_minimum_priority",
    "linker_set_key" : "__android_log_get_minimum_priority",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_is_debuggable",
    "linker_set_key" : "__android_log_is_debuggable",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_properties.h"
+   "source_file" : "/system/core/liblog/include/log/log_properties.h"
   },
   {
    "function_name" : "__android_log_is_loggable",
@@ -845,7 +845,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_is_loggable_len",
@@ -866,7 +866,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_logd_logger",
@@ -878,7 +878,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_read",
@@ -902,7 +902,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_write",
@@ -926,7 +926,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_print",
@@ -944,13 +944,13 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_security",
    "linker_set_key" : "__android_log_security",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_security_bswrite",
@@ -965,7 +965,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_set_aborter",
@@ -977,7 +977,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_default_tag",
@@ -989,7 +989,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_logger",
@@ -1001,7 +1001,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_minimum_priority",
@@ -1013,7 +1013,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_stderr_logger",
@@ -1025,7 +1025,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_vprint",
@@ -1046,7 +1046,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write",
@@ -1064,7 +1064,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write_log_message",
@@ -1076,7 +1076,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_logger_get_buffer_size",
@@ -1088,7 +1088,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_logger_property_get_bool",
@@ -1103,7 +1103,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_destroy",
@@ -1115,7 +1115,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_id_to_name",
@@ -1127,7 +1127,7 @@
     }
    ],
    "return_type" : "_ZTIPKc",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_log_parser_reset",
@@ -1145,7 +1145,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_processBinaryLogBuffer",
@@ -1169,7 +1169,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_processLogBuffer",
@@ -1184,7 +1184,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_read_next",
@@ -1196,7 +1196,7 @@
     }
    ],
    "return_type" : "_ZTI24android_log_list_element",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_reset",
@@ -1208,7 +1208,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_float32",
@@ -1223,7 +1223,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int32",
@@ -1238,7 +1238,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int64",
@@ -1253,7 +1253,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list",
@@ -1268,7 +1268,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_begin",
@@ -1280,7 +1280,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_buffer",
@@ -1295,7 +1295,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_write_list_end",
@@ -1307,7 +1307,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8",
@@ -1322,7 +1322,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8_len",
@@ -1340,7 +1340,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_logger_clear",
@@ -1352,7 +1352,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_id",
@@ -1364,7 +1364,7 @@
     }
    ],
    "return_type" : "_ZTI6log_id",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_readable_size",
@@ -1376,7 +1376,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_size",
@@ -1388,7 +1388,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_version",
@@ -1400,7 +1400,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_prune_list",
@@ -1418,7 +1418,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_statistics",
@@ -1436,7 +1436,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc",
@@ -1454,7 +1454,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc_time",
@@ -1472,7 +1472,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_free",
@@ -1484,7 +1484,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_open",
@@ -1505,7 +1505,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_read",
@@ -1520,7 +1520,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_open",
@@ -1535,7 +1535,7 @@
     }
    ],
    "return_type" : "_ZTIP6logger",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_log_size",
@@ -1550,7 +1550,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_prune_list",
@@ -1568,7 +1568,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_lookupEventTagNum",
@@ -1589,7 +1589,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "android_name_to_log_id",
@@ -1601,7 +1601,7 @@
     }
    ],
    "return_type" : "_ZTI6log_id",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_openEventTagMap",
@@ -1613,7 +1613,7 @@
     }
    ],
    "return_type" : "_ZTIP11EventTagMap",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "create_android_log_parser",
@@ -1628,7 +1628,7 @@
     }
    ],
    "return_type" : "_ZTIP28android_log_context_internal",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "create_android_logger",
@@ -1640,7 +1640,7 @@
     }
    ],
    "return_type" : "_ZTIP28android_log_context_internal",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "global_vars" : [],
@@ -1653,7 +1653,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIR22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1662,7 +1662,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,
@@ -1671,7 +1671,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,
@@ -1680,7 +1680,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,
@@ -1689,7 +1689,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "pointer_types" :
@@ -1701,7 +1701,7 @@
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIP11EventTagMap",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -1710,7 +1710,7 @@
    "referenced_type" : "_ZTI11logger_list",
    "self_type" : "_ZTIP11logger_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1719,7 +1719,7 @@
    "referenced_type" : "_ZTI12logger_entry",
    "self_type" : "_ZTIP12logger_entry",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1728,7 +1728,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTIP17AndroidLogEntry_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1737,7 +1737,7 @@
    "referenced_type" : "_ZTI18AndroidLogFormat_t",
    "self_type" : "_ZTIP18AndroidLogFormat_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1746,7 +1746,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTIP21__android_log_message",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1755,7 +1755,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIP22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1764,7 +1764,7 @@
    "referenced_type" : "_ZTI28android_log_context_internal",
    "self_type" : "_ZTIP28android_log_context_internal",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1773,7 +1773,7 @@
    "referenced_type" : "_ZTI6logger",
    "self_type" : "_ZTIP6logger",
    "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" : "_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,
@@ -1791,7 +1791,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,
@@ -1800,7 +1800,7 @@
    "referenced_type" : "_ZTIFi6log_idcPKcS1_jPvE",
    "self_type" : "_ZTIPFi6log_idcPKcS1_jPvE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -1809,7 +1809,7 @@
    "referenced_type" : "_ZTIFvPK21__android_log_messageE",
    "self_type" : "_ZTIPFvPK21__android_log_messageE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1818,7 +1818,7 @@
    "referenced_type" : "_ZTIFvPKcE",
    "self_type" : "_ZTIPFvPKcE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1827,7 +1827,7 @@
    "referenced_type" : "_ZTIK11EventTagMap",
    "self_type" : "_ZTIPK11EventTagMap",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1836,7 +1836,7 @@
    "referenced_type" : "_ZTIK17AndroidLogEntry_t",
    "self_type" : "_ZTIPK17AndroidLogEntry_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1845,7 +1845,7 @@
    "referenced_type" : "_ZTIK21__android_log_message",
    "self_type" : "_ZTIPK21__android_log_message",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1854,7 +1854,7 @@
    "referenced_type" : "_ZTIK22android_log_event_list",
    "self_type" : "_ZTIPK22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1863,7 +1863,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,
@@ -1872,7 +1872,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,
@@ -1881,7 +1881,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1890,7 +1890,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "alignment" : 4,
@@ -1899,7 +1899,7 @@
    "referenced_type" : "_ZTIP28android_log_context_internal",
    "self_type" : "_ZTIPP28android_log_context_internal",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1908,7 +1908,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -1917,7 +1917,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1926,7 +1926,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1935,7 +1935,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "qualified_types" :
@@ -1946,7 +1946,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"
   },
   {
    "is_const" : true,
@@ -1954,7 +1954,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIK11EventTagMap",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1964,7 +1964,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTIK17AndroidLogEntry_t",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1974,7 +1974,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTIK21__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,
@@ -1984,7 +1984,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIK22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1994,7 +1994,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,
@@ -2004,7 +2004,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,
@@ -2014,7 +2014,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,
@@ -2024,7 +2024,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2034,7 +2034,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -2044,7 +2044,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"
   },
   {
    "is_const" : true,
@@ -2052,7 +2052,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   }
  ],
  "record_types" :
@@ -2106,7 +2106,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,
@@ -2167,7 +2167,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTI17AndroidLogEntry_t",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 1,
@@ -2188,7 +2188,7 @@
    "referenced_type" : "_ZTI19android_event_int_t",
    "self_type" : "_ZTI19android_event_int_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2209,7 +2209,7 @@
    "referenced_type" : "_ZTI20android_event_list_t",
    "self_type" : "_ZTI20android_event_list_t",
    "size" : 2,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2230,7 +2230,7 @@
    "referenced_type" : "_ZTI20android_event_long_t",
    "self_type" : "_ZTI20android_event_long_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2256,7 +2256,7 @@
    "referenced_type" : "_ZTI20android_log_header_t",
    "self_type" : "_ZTI20android_log_header_t",
    "size" : 11,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2302,7 +2302,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" : 1,
@@ -2323,7 +2323,7 @@
    "referenced_type" : "_ZTI21android_event_float_t",
    "self_type" : "_ZTI21android_event_float_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2339,7 +2339,7 @@
    "referenced_type" : "_ZTI22android_event_header_t",
    "self_type" : "_ZTI22android_event_header_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2365,7 +2365,7 @@
    "referenced_type" : "_ZTI22android_event_string_t",
    "self_type" : "_ZTI22android_event_string_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2389,7 +2389,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTI22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2410,7 +2410,7 @@
    "referenced_type" : "_ZTI23android_log_event_int_t",
    "self_type" : "_ZTI23android_log_event_int_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2431,7 +2431,7 @@
    "referenced_type" : "_ZTI24android_log_event_long_t",
    "self_type" : "_ZTI24android_log_event_long_t",
    "size" : 13,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -2462,7 +2462,7 @@
    "referenced_type" : "_ZTI24android_log_list_element",
    "self_type" : "_ZTI24android_log_list_element",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2493,7 +2493,7 @@
    "referenced_type" : "_ZTI25android_pmsg_log_header_t",
    "self_type" : "_ZTI25android_pmsg_log_header_t",
    "size" : 7,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2524,7 +2524,7 @@
    "referenced_type" : "_ZTI26android_log_event_string_t",
    "self_type" : "_ZTI26android_log_event_string_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2539,7 +2539,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" : 1,
@@ -2560,7 +2560,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,
@@ -2585,12 +2585,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN24android_log_list_elementUt_E",
-   "name" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:48:3)",
+   "name" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:48:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN24android_log_list_elementUt_E",
    "self_type" : "_ZTIN24android_log_list_elementUt_E",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2607,12 +2607,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"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/30/64/x86/source-based/liblog.so.lsdump b/30/64/x86/source-based/liblog.so.lsdump
index 082840f..e0c66af 100644
--- a/30/64/x86/source-based/liblog.so.lsdump
+++ b/30/64/x86/source-based/liblog.so.lsdump
@@ -10,14 +10,14 @@
    "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"
   },
   {
    "linker_set_key" : "_ZTIA_c",
    "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" :
@@ -384,7 +384,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"
   },
   {
@@ -433,7 +433,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"
   },
   {
@@ -522,7 +522,7 @@
    "referenced_type" : "_ZTI21AndroidLogPrintFormat",
    "self_type" : "_ZTI21AndroidLogPrintFormat",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -579,7 +579,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"
   }
  ],
@@ -613,7 +613,7 @@
    "referenced_type" : "_ZTIFi6log_idcPKcS1_jPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFi6log_idcPKcS1_jPvE",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -628,7 +628,7 @@
    "referenced_type" : "_ZTIFvPK21__android_log_messageE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPK21__android_log_messageE",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -643,7 +643,7 @@
    "referenced_type" : "_ZTIFvPKcE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKcE",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   }
  ],
  "functions" :
@@ -664,7 +664,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bswrite",
@@ -679,7 +679,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_btwrite",
@@ -700,7 +700,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_buf_print",
@@ -721,7 +721,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_buf_write",
@@ -742,7 +742,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bwrite",
@@ -760,7 +760,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_call_aborter",
@@ -772,13 +772,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_close",
    "linker_set_key" : "__android_log_close",
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_default_aborter",
@@ -790,7 +790,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_error_write",
@@ -814,19 +814,19 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_safetynet.h"
+   "source_file" : "/system/core/liblog/include/log/log_safetynet.h"
   },
   {
    "function_name" : "__android_log_get_minimum_priority",
    "linker_set_key" : "__android_log_get_minimum_priority",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_is_debuggable",
    "linker_set_key" : "__android_log_is_debuggable",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_properties.h"
+   "source_file" : "/system/core/liblog/include/log/log_properties.h"
   },
   {
    "function_name" : "__android_log_is_loggable",
@@ -844,7 +844,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_is_loggable_len",
@@ -865,7 +865,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_logd_logger",
@@ -877,7 +877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_read",
@@ -901,7 +901,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_write",
@@ -925,7 +925,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_print",
@@ -943,13 +943,13 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_security",
    "linker_set_key" : "__android_log_security",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_security_bswrite",
@@ -964,7 +964,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_set_aborter",
@@ -976,7 +976,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_default_tag",
@@ -988,7 +988,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_logger",
@@ -1000,7 +1000,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_minimum_priority",
@@ -1012,7 +1012,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_stderr_logger",
@@ -1024,7 +1024,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_vprint",
@@ -1045,7 +1045,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write",
@@ -1063,7 +1063,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write_log_message",
@@ -1075,7 +1075,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_logger_get_buffer_size",
@@ -1087,7 +1087,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_logger_property_get_bool",
@@ -1102,7 +1102,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_destroy",
@@ -1114,7 +1114,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_id_to_name",
@@ -1126,7 +1126,7 @@
     }
    ],
    "return_type" : "_ZTIPKc",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_log_parser_reset",
@@ -1144,7 +1144,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_processBinaryLogBuffer",
@@ -1168,7 +1168,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_processLogBuffer",
@@ -1183,7 +1183,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_read_next",
@@ -1195,7 +1195,7 @@
     }
    ],
    "return_type" : "_ZTI24android_log_list_element",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_reset",
@@ -1207,7 +1207,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_float32",
@@ -1222,7 +1222,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int32",
@@ -1237,7 +1237,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int64",
@@ -1252,7 +1252,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list",
@@ -1267,7 +1267,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_begin",
@@ -1279,7 +1279,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_buffer",
@@ -1294,7 +1294,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_write_list_end",
@@ -1306,7 +1306,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8",
@@ -1321,7 +1321,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8_len",
@@ -1339,7 +1339,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_logger_clear",
@@ -1351,7 +1351,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_id",
@@ -1363,7 +1363,7 @@
     }
    ],
    "return_type" : "_ZTI6log_id",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_readable_size",
@@ -1375,7 +1375,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_size",
@@ -1387,7 +1387,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_version",
@@ -1399,7 +1399,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_prune_list",
@@ -1417,7 +1417,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_statistics",
@@ -1435,7 +1435,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc",
@@ -1453,7 +1453,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc_time",
@@ -1471,7 +1471,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_free",
@@ -1483,7 +1483,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_open",
@@ -1504,7 +1504,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_read",
@@ -1519,7 +1519,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_open",
@@ -1534,7 +1534,7 @@
     }
    ],
    "return_type" : "_ZTIP6logger",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_log_size",
@@ -1549,7 +1549,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_prune_list",
@@ -1567,7 +1567,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_lookupEventTagNum",
@@ -1588,7 +1588,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "android_name_to_log_id",
@@ -1600,7 +1600,7 @@
     }
    ],
    "return_type" : "_ZTI6log_id",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_openEventTagMap",
@@ -1612,7 +1612,7 @@
     }
    ],
    "return_type" : "_ZTIP11EventTagMap",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "create_android_log_parser",
@@ -1627,7 +1627,7 @@
     }
    ],
    "return_type" : "_ZTIP28android_log_context_internal",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "create_android_logger",
@@ -1639,7 +1639,7 @@
     }
    ],
    "return_type" : "_ZTIP28android_log_context_internal",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "global_vars" : [],
@@ -1652,7 +1652,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIR22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1661,7 +1661,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,
@@ -1670,7 +1670,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,
@@ -1679,7 +1679,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,
@@ -1688,7 +1688,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "pointer_types" :
@@ -1700,7 +1700,7 @@
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIP11EventTagMap",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -1709,7 +1709,7 @@
    "referenced_type" : "_ZTI11logger_list",
    "self_type" : "_ZTIP11logger_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1718,7 +1718,7 @@
    "referenced_type" : "_ZTI12logger_entry",
    "self_type" : "_ZTIP12logger_entry",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1727,7 +1727,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTIP17AndroidLogEntry_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1736,7 +1736,7 @@
    "referenced_type" : "_ZTI18AndroidLogFormat_t",
    "self_type" : "_ZTIP18AndroidLogFormat_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1745,7 +1745,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTIP21__android_log_message",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1754,7 +1754,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIP22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1763,7 +1763,7 @@
    "referenced_type" : "_ZTI28android_log_context_internal",
    "self_type" : "_ZTIP28android_log_context_internal",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1772,7 +1772,7 @@
    "referenced_type" : "_ZTI6logger",
    "self_type" : "_ZTIP6logger",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1781,7 +1781,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,
@@ -1790,7 +1790,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,
@@ -1799,7 +1799,7 @@
    "referenced_type" : "_ZTIFi6log_idcPKcS1_jPvE",
    "self_type" : "_ZTIPFi6log_idcPKcS1_jPvE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -1808,7 +1808,7 @@
    "referenced_type" : "_ZTIFvPK21__android_log_messageE",
    "self_type" : "_ZTIPFvPK21__android_log_messageE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1817,7 +1817,7 @@
    "referenced_type" : "_ZTIFvPKcE",
    "self_type" : "_ZTIPFvPKcE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1826,7 +1826,7 @@
    "referenced_type" : "_ZTIK11EventTagMap",
    "self_type" : "_ZTIPK11EventTagMap",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1835,7 +1835,7 @@
    "referenced_type" : "_ZTIK17AndroidLogEntry_t",
    "self_type" : "_ZTIPK17AndroidLogEntry_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1844,7 +1844,7 @@
    "referenced_type" : "_ZTIK21__android_log_message",
    "self_type" : "_ZTIPK21__android_log_message",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1853,7 +1853,7 @@
    "referenced_type" : "_ZTIK22android_log_event_list",
    "self_type" : "_ZTIPK22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1862,7 +1862,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,
@@ -1871,7 +1871,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,
@@ -1880,7 +1880,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1889,7 +1889,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "alignment" : 4,
@@ -1898,7 +1898,7 @@
    "referenced_type" : "_ZTIP28android_log_context_internal",
    "self_type" : "_ZTIPP28android_log_context_internal",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1907,7 +1907,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -1916,7 +1916,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1925,7 +1925,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1934,7 +1934,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "qualified_types" :
@@ -1945,7 +1945,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"
   },
   {
    "is_const" : true,
@@ -1953,7 +1953,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIK11EventTagMap",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1963,7 +1963,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTIK17AndroidLogEntry_t",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1973,7 +1973,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTIK21__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,
@@ -1983,7 +1983,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIK22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1993,7 +1993,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,
@@ -2003,7 +2003,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,
@@ -2013,7 +2013,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,
@@ -2023,7 +2023,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2033,7 +2033,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -2043,7 +2043,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"
   },
   {
    "is_const" : true,
@@ -2051,7 +2051,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   }
  ],
  "record_types" :
@@ -2105,7 +2105,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,
@@ -2166,7 +2166,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTI17AndroidLogEntry_t",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 1,
@@ -2187,7 +2187,7 @@
    "referenced_type" : "_ZTI19android_event_int_t",
    "self_type" : "_ZTI19android_event_int_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2208,7 +2208,7 @@
    "referenced_type" : "_ZTI20android_event_list_t",
    "self_type" : "_ZTI20android_event_list_t",
    "size" : 2,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2229,7 +2229,7 @@
    "referenced_type" : "_ZTI20android_event_long_t",
    "self_type" : "_ZTI20android_event_long_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2255,7 +2255,7 @@
    "referenced_type" : "_ZTI20android_log_header_t",
    "self_type" : "_ZTI20android_log_header_t",
    "size" : 11,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2301,7 +2301,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" : 1,
@@ -2322,7 +2322,7 @@
    "referenced_type" : "_ZTI21android_event_float_t",
    "self_type" : "_ZTI21android_event_float_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2338,7 +2338,7 @@
    "referenced_type" : "_ZTI22android_event_header_t",
    "self_type" : "_ZTI22android_event_header_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2364,7 +2364,7 @@
    "referenced_type" : "_ZTI22android_event_string_t",
    "self_type" : "_ZTI22android_event_string_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2388,7 +2388,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTI22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2409,7 +2409,7 @@
    "referenced_type" : "_ZTI23android_log_event_int_t",
    "self_type" : "_ZTI23android_log_event_int_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2430,7 +2430,7 @@
    "referenced_type" : "_ZTI24android_log_event_long_t",
    "self_type" : "_ZTI24android_log_event_long_t",
    "size" : 13,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2461,7 +2461,7 @@
    "referenced_type" : "_ZTI24android_log_list_element",
    "self_type" : "_ZTI24android_log_list_element",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2492,7 +2492,7 @@
    "referenced_type" : "_ZTI25android_pmsg_log_header_t",
    "self_type" : "_ZTI25android_pmsg_log_header_t",
    "size" : 7,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2523,7 +2523,7 @@
    "referenced_type" : "_ZTI26android_log_event_string_t",
    "self_type" : "_ZTI26android_log_event_string_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2538,7 +2538,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" : 1,
@@ -2559,7 +2559,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,
@@ -2584,12 +2584,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN24android_log_list_elementUt_E",
-   "name" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:48:3)",
+   "name" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:48:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN24android_log_list_elementUt_E",
    "self_type" : "_ZTIN24android_log_list_elementUt_E",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2606,12 +2606,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"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/30/64/x86_64/source-based/liblog.so.lsdump b/30/64/x86_64/source-based/liblog.so.lsdump
index 45477b0..e71cb10 100644
--- a/30/64/x86_64/source-based/liblog.so.lsdump
+++ b/30/64/x86_64/source-based/liblog.so.lsdump
@@ -10,14 +10,14 @@
    "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"
   },
   {
    "linker_set_key" : "_ZTIA_c",
    "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" :
@@ -365,7 +365,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"
   },
   {
@@ -414,7 +414,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"
   },
   {
@@ -503,7 +503,7 @@
    "referenced_type" : "_ZTI21AndroidLogPrintFormat",
    "self_type" : "_ZTI21AndroidLogPrintFormat",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -560,7 +560,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"
   }
  ],
@@ -594,7 +594,7 @@
    "referenced_type" : "_ZTIFl6log_idcPKcS1_mPvE",
    "return_type" : "_ZTIl",
    "self_type" : "_ZTIFl6log_idcPKcS1_mPvE",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -609,7 +609,7 @@
    "referenced_type" : "_ZTIFvPK21__android_log_messageE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPK21__android_log_messageE",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -624,7 +624,7 @@
    "referenced_type" : "_ZTIFvPKcE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKcE",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   }
  ],
  "functions" :
@@ -645,7 +645,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bswrite",
@@ -660,7 +660,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_btwrite",
@@ -681,7 +681,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_buf_print",
@@ -702,7 +702,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_buf_write",
@@ -723,7 +723,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bwrite",
@@ -741,7 +741,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_call_aborter",
@@ -753,13 +753,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_close",
    "linker_set_key" : "__android_log_close",
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_default_aborter",
@@ -771,7 +771,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_error_write",
@@ -795,19 +795,19 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_safetynet.h"
+   "source_file" : "/system/core/liblog/include/log/log_safetynet.h"
   },
   {
    "function_name" : "__android_log_get_minimum_priority",
    "linker_set_key" : "__android_log_get_minimum_priority",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_is_debuggable",
    "linker_set_key" : "__android_log_is_debuggable",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_properties.h"
+   "source_file" : "/system/core/liblog/include/log/log_properties.h"
   },
   {
    "function_name" : "__android_log_is_loggable",
@@ -825,7 +825,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_is_loggable_len",
@@ -846,7 +846,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_logd_logger",
@@ -858,7 +858,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_read",
@@ -882,7 +882,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_write",
@@ -906,7 +906,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_print",
@@ -924,13 +924,13 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_security",
    "linker_set_key" : "__android_log_security",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_security_bswrite",
@@ -945,7 +945,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_set_aborter",
@@ -957,7 +957,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_default_tag",
@@ -969,7 +969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_logger",
@@ -981,7 +981,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_minimum_priority",
@@ -993,7 +993,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_stderr_logger",
@@ -1005,7 +1005,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_vprint",
@@ -1026,7 +1026,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write",
@@ -1044,7 +1044,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write_log_message",
@@ -1056,7 +1056,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_logger_get_buffer_size",
@@ -1068,7 +1068,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_logger_property_get_bool",
@@ -1083,7 +1083,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_destroy",
@@ -1095,7 +1095,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_id_to_name",
@@ -1107,7 +1107,7 @@
     }
    ],
    "return_type" : "_ZTIPKc",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_log_parser_reset",
@@ -1125,7 +1125,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_processBinaryLogBuffer",
@@ -1149,7 +1149,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_processLogBuffer",
@@ -1164,7 +1164,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_read_next",
@@ -1176,7 +1176,7 @@
     }
    ],
    "return_type" : "_ZTI24android_log_list_element",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_reset",
@@ -1188,7 +1188,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_float32",
@@ -1203,7 +1203,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int32",
@@ -1218,7 +1218,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int64",
@@ -1233,7 +1233,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list",
@@ -1248,7 +1248,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_begin",
@@ -1260,7 +1260,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_buffer",
@@ -1275,7 +1275,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_write_list_end",
@@ -1287,7 +1287,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8",
@@ -1302,7 +1302,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8_len",
@@ -1320,7 +1320,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_logger_clear",
@@ -1332,7 +1332,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_id",
@@ -1344,7 +1344,7 @@
     }
    ],
    "return_type" : "_ZTI6log_id",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_readable_size",
@@ -1356,7 +1356,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_size",
@@ -1368,7 +1368,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_version",
@@ -1380,7 +1380,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_prune_list",
@@ -1398,7 +1398,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_statistics",
@@ -1416,7 +1416,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc",
@@ -1434,7 +1434,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc_time",
@@ -1452,7 +1452,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_free",
@@ -1464,7 +1464,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_open",
@@ -1485,7 +1485,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_read",
@@ -1500,7 +1500,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_open",
@@ -1515,7 +1515,7 @@
     }
    ],
    "return_type" : "_ZTIP6logger",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_log_size",
@@ -1530,7 +1530,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_prune_list",
@@ -1548,7 +1548,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_lookupEventTagNum",
@@ -1569,7 +1569,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "android_name_to_log_id",
@@ -1581,7 +1581,7 @@
     }
    ],
    "return_type" : "_ZTI6log_id",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_openEventTagMap",
@@ -1593,7 +1593,7 @@
     }
    ],
    "return_type" : "_ZTIP11EventTagMap",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "create_android_log_parser",
@@ -1608,7 +1608,7 @@
     }
    ],
    "return_type" : "_ZTIP28android_log_context_internal",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "create_android_logger",
@@ -1620,7 +1620,7 @@
     }
    ],
    "return_type" : "_ZTIP28android_log_context_internal",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "global_vars" : [],
@@ -1633,7 +1633,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIR22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1642,7 +1642,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,
@@ -1651,7 +1651,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,
@@ -1660,7 +1660,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,
@@ -1669,7 +1669,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "pointer_types" :
@@ -1681,7 +1681,7 @@
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIP11EventTagMap",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 8,
@@ -1690,7 +1690,7 @@
    "referenced_type" : "_ZTI11logger_list",
    "self_type" : "_ZTIP11logger_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -1699,7 +1699,7 @@
    "referenced_type" : "_ZTI12logger_entry",
    "self_type" : "_ZTIP12logger_entry",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -1708,7 +1708,7 @@
    "referenced_type" : "_ZTI13__va_list_tag",
    "self_type" : "_ZTIP13__va_list_tag",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 8,
@@ -1717,7 +1717,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTIP17AndroidLogEntry_t",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -1726,7 +1726,7 @@
    "referenced_type" : "_ZTI18AndroidLogFormat_t",
    "self_type" : "_ZTIP18AndroidLogFormat_t",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -1735,7 +1735,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTIP21__android_log_message",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 8,
@@ -1744,7 +1744,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIP22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1753,7 +1753,7 @@
    "referenced_type" : "_ZTI28android_log_context_internal",
    "self_type" : "_ZTIP28android_log_context_internal",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1762,7 +1762,7 @@
    "referenced_type" : "_ZTI6logger",
    "self_type" : "_ZTIP6logger",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -1771,7 +1771,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,
@@ -1780,7 +1780,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,
@@ -1789,7 +1789,7 @@
    "referenced_type" : "_ZTIFl6log_idcPKcS1_mPvE",
    "self_type" : "_ZTIPFl6log_idcPKcS1_mPvE",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -1798,7 +1798,7 @@
    "referenced_type" : "_ZTIFvPK21__android_log_messageE",
    "self_type" : "_ZTIPFvPK21__android_log_messageE",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 8,
@@ -1807,7 +1807,7 @@
    "referenced_type" : "_ZTIFvPKcE",
    "self_type" : "_ZTIPFvPKcE",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 8,
@@ -1816,7 +1816,7 @@
    "referenced_type" : "_ZTIK11EventTagMap",
    "self_type" : "_ZTIPK11EventTagMap",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -1825,7 +1825,7 @@
    "referenced_type" : "_ZTIK17AndroidLogEntry_t",
    "self_type" : "_ZTIPK17AndroidLogEntry_t",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -1834,7 +1834,7 @@
    "referenced_type" : "_ZTIK21__android_log_message",
    "self_type" : "_ZTIPK21__android_log_message",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 8,
@@ -1843,7 +1843,7 @@
    "referenced_type" : "_ZTIK22android_log_event_list",
    "self_type" : "_ZTIPK22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1852,7 +1852,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,
@@ -1861,7 +1861,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,
@@ -1870,7 +1870,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 8,
@@ -1879,7 +1879,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "alignment" : 8,
@@ -1888,7 +1888,7 @@
    "referenced_type" : "_ZTIP28android_log_context_internal",
    "self_type" : "_ZTIPP28android_log_context_internal",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 8,
@@ -1897,7 +1897,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -1906,7 +1906,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
@@ -1915,7 +1915,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIPm",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -1924,7 +1924,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "qualified_types" :
@@ -1935,7 +1935,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"
   },
   {
    "is_const" : true,
@@ -1943,7 +1943,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIK11EventTagMap",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -1953,7 +1953,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTIK17AndroidLogEntry_t",
    "size" : 64,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 8,
@@ -1963,7 +1963,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTIK21__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,
@@ -1973,7 +1973,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIK22android_log_event_list",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1983,7 +1983,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,
@@ -1993,7 +1993,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,
@@ -2003,7 +2003,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" : 8,
@@ -2013,7 +2013,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 24,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2023,7 +2023,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -2033,7 +2033,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"
   },
   {
    "is_const" : true,
@@ -2041,7 +2041,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   }
  ],
  "record_types" :
@@ -2095,7 +2095,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,
@@ -2156,7 +2156,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTI17AndroidLogEntry_t",
    "size" : 64,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 1,
@@ -2177,7 +2177,7 @@
    "referenced_type" : "_ZTI19android_event_int_t",
    "self_type" : "_ZTI19android_event_int_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2198,7 +2198,7 @@
    "referenced_type" : "_ZTI20android_event_list_t",
    "self_type" : "_ZTI20android_event_list_t",
    "size" : 2,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2219,7 +2219,7 @@
    "referenced_type" : "_ZTI20android_event_long_t",
    "self_type" : "_ZTI20android_event_long_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2245,7 +2245,7 @@
    "referenced_type" : "_ZTI20android_log_header_t",
    "self_type" : "_ZTI20android_log_header_t",
    "size" : 11,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -2291,7 +2291,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" : 1,
@@ -2312,7 +2312,7 @@
    "referenced_type" : "_ZTI21android_event_float_t",
    "self_type" : "_ZTI21android_event_float_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2328,7 +2328,7 @@
    "referenced_type" : "_ZTI22android_event_header_t",
    "self_type" : "_ZTI22android_event_header_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2354,7 +2354,7 @@
    "referenced_type" : "_ZTI22android_event_string_t",
    "self_type" : "_ZTI22android_event_string_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -2378,7 +2378,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTI22android_log_event_list",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2399,7 +2399,7 @@
    "referenced_type" : "_ZTI23android_log_event_int_t",
    "self_type" : "_ZTI23android_log_event_int_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2420,7 +2420,7 @@
    "referenced_type" : "_ZTI24android_log_event_long_t",
    "self_type" : "_ZTI24android_log_event_long_t",
    "size" : 13,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 8,
@@ -2451,7 +2451,7 @@
    "referenced_type" : "_ZTI24android_log_list_element",
    "self_type" : "_ZTI24android_log_list_element",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2482,7 +2482,7 @@
    "referenced_type" : "_ZTI25android_pmsg_log_header_t",
    "self_type" : "_ZTI25android_pmsg_log_header_t",
    "size" : 7,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2513,7 +2513,7 @@
    "referenced_type" : "_ZTI26android_log_event_string_t",
    "self_type" : "_ZTI26android_log_event_string_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2528,7 +2528,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" : 1,
@@ -2549,7 +2549,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,
@@ -2574,12 +2574,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN24android_log_list_elementUt_E",
-   "name" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:48:3)",
+   "name" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:48:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN24android_log_list_elementUt_E",
    "self_type" : "_ZTIN24android_log_list_elementUt_E",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2596,12 +2596,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"
   }
  ],
  "rvalue_reference_types" : []
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 082840f..e0c66af 100644
--- a/30/64/x86_x86_64/source-based/liblog.so.lsdump
+++ b/30/64/x86_x86_64/source-based/liblog.so.lsdump
@@ -10,14 +10,14 @@
    "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"
   },
   {
    "linker_set_key" : "_ZTIA_c",
    "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" :
@@ -384,7 +384,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"
   },
   {
@@ -433,7 +433,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"
   },
   {
@@ -522,7 +522,7 @@
    "referenced_type" : "_ZTI21AndroidLogPrintFormat",
    "self_type" : "_ZTI21AndroidLogPrintFormat",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h",
+   "source_file" : "/system/core/liblog/include/log/logprint.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -579,7 +579,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"
   }
  ],
@@ -613,7 +613,7 @@
    "referenced_type" : "_ZTIFi6log_idcPKcS1_jPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFi6log_idcPKcS1_jPvE",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -628,7 +628,7 @@
    "referenced_type" : "_ZTIFvPK21__android_log_messageE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPK21__android_log_messageE",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -643,7 +643,7 @@
    "referenced_type" : "_ZTIFvPKcE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKcE",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   }
  ],
  "functions" :
@@ -664,7 +664,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bswrite",
@@ -679,7 +679,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_btwrite",
@@ -700,7 +700,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_buf_print",
@@ -721,7 +721,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_buf_write",
@@ -742,7 +742,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_bwrite",
@@ -760,7 +760,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_call_aborter",
@@ -772,13 +772,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_close",
    "linker_set_key" : "__android_log_close",
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "function_name" : "__android_log_default_aborter",
@@ -790,7 +790,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_error_write",
@@ -814,19 +814,19 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_safetynet.h"
+   "source_file" : "/system/core/liblog/include/log/log_safetynet.h"
   },
   {
    "function_name" : "__android_log_get_minimum_priority",
    "linker_set_key" : "__android_log_get_minimum_priority",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_is_debuggable",
    "linker_set_key" : "__android_log_is_debuggable",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_properties.h"
+   "source_file" : "/system/core/liblog/include/log/log_properties.h"
   },
   {
    "function_name" : "__android_log_is_loggable",
@@ -844,7 +844,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_is_loggable_len",
@@ -865,7 +865,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_logd_logger",
@@ -877,7 +877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_read",
@@ -901,7 +901,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_pmsg_file_write",
@@ -925,7 +925,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_print",
@@ -943,13 +943,13 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_security",
    "linker_set_key" : "__android_log_security",
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_security_bswrite",
@@ -964,7 +964,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_log_set_aborter",
@@ -976,7 +976,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_default_tag",
@@ -988,7 +988,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_logger",
@@ -1000,7 +1000,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_set_minimum_priority",
@@ -1012,7 +1012,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_stderr_logger",
@@ -1024,7 +1024,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_vprint",
@@ -1045,7 +1045,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write",
@@ -1063,7 +1063,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_log_write_log_message",
@@ -1075,7 +1075,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "function_name" : "__android_logger_get_buffer_size",
@@ -1087,7 +1087,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "__android_logger_property_get_bool",
@@ -1102,7 +1102,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_destroy",
@@ -1114,7 +1114,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_id_to_name",
@@ -1126,7 +1126,7 @@
     }
    ],
    "return_type" : "_ZTIPKc",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_log_parser_reset",
@@ -1144,7 +1144,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_processBinaryLogBuffer",
@@ -1168,7 +1168,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_processLogBuffer",
@@ -1183,7 +1183,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "function_name" : "android_log_read_next",
@@ -1195,7 +1195,7 @@
     }
    ],
    "return_type" : "_ZTI24android_log_list_element",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_reset",
@@ -1207,7 +1207,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_float32",
@@ -1222,7 +1222,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int32",
@@ -1237,7 +1237,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_int64",
@@ -1252,7 +1252,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list",
@@ -1267,7 +1267,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_begin",
@@ -1279,7 +1279,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_list_buffer",
@@ -1294,7 +1294,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "function_name" : "android_log_write_list_end",
@@ -1306,7 +1306,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8",
@@ -1321,7 +1321,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_log_write_string8_len",
@@ -1339,7 +1339,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "android_logger_clear",
@@ -1351,7 +1351,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_id",
@@ -1363,7 +1363,7 @@
     }
    ],
    "return_type" : "_ZTI6log_id",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_readable_size",
@@ -1375,7 +1375,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_size",
@@ -1387,7 +1387,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_log_version",
@@ -1399,7 +1399,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_prune_list",
@@ -1417,7 +1417,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_get_statistics",
@@ -1435,7 +1435,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc",
@@ -1453,7 +1453,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_alloc_time",
@@ -1471,7 +1471,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_free",
@@ -1483,7 +1483,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_open",
@@ -1504,7 +1504,7 @@
     }
    ],
    "return_type" : "_ZTIP11logger_list",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_list_read",
@@ -1519,7 +1519,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_open",
@@ -1534,7 +1534,7 @@
     }
    ],
    "return_type" : "_ZTIP6logger",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_log_size",
@@ -1549,7 +1549,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_logger_set_prune_list",
@@ -1567,7 +1567,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "function_name" : "android_lookupEventTagNum",
@@ -1588,7 +1588,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "android_name_to_log_id",
@@ -1600,7 +1600,7 @@
     }
    ],
    "return_type" : "_ZTI6log_id",
-   "source_file" : "/system/logging/liblog/include/log/log_id.h"
+   "source_file" : "/system/core/liblog/include/log/log_id.h"
   },
   {
    "function_name" : "android_openEventTagMap",
@@ -1612,7 +1612,7 @@
     }
    ],
    "return_type" : "_ZTIP11EventTagMap",
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "function_name" : "create_android_log_parser",
@@ -1627,7 +1627,7 @@
     }
    ],
    "return_type" : "_ZTIP28android_log_context_internal",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "function_name" : "create_android_logger",
@@ -1639,7 +1639,7 @@
     }
    ],
    "return_type" : "_ZTIP28android_log_context_internal",
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "global_vars" : [],
@@ -1652,7 +1652,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIR22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1661,7 +1661,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,
@@ -1670,7 +1670,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,
@@ -1679,7 +1679,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,
@@ -1688,7 +1688,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   }
  ],
  "pointer_types" :
@@ -1700,7 +1700,7 @@
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIP11EventTagMap",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/event_tag_map.h"
+   "source_file" : "/system/core/liblog/include/log/event_tag_map.h"
   },
   {
    "alignment" : 4,
@@ -1709,7 +1709,7 @@
    "referenced_type" : "_ZTI11logger_list",
    "self_type" : "_ZTIP11logger_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1718,7 +1718,7 @@
    "referenced_type" : "_ZTI12logger_entry",
    "self_type" : "_ZTIP12logger_entry",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1727,7 +1727,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTIP17AndroidLogEntry_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1736,7 +1736,7 @@
    "referenced_type" : "_ZTI18AndroidLogFormat_t",
    "self_type" : "_ZTIP18AndroidLogFormat_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1745,7 +1745,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTIP21__android_log_message",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1754,7 +1754,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIP22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1763,7 +1763,7 @@
    "referenced_type" : "_ZTI28android_log_context_internal",
    "self_type" : "_ZTIP28android_log_context_internal",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1772,7 +1772,7 @@
    "referenced_type" : "_ZTI6logger",
    "self_type" : "_ZTIP6logger",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1781,7 +1781,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,
@@ -1790,7 +1790,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,
@@ -1799,7 +1799,7 @@
    "referenced_type" : "_ZTIFi6log_idcPKcS1_jPvE",
    "self_type" : "_ZTIPFi6log_idcPKcS1_jPvE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -1808,7 +1808,7 @@
    "referenced_type" : "_ZTIFvPK21__android_log_messageE",
    "self_type" : "_ZTIPFvPK21__android_log_messageE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1817,7 +1817,7 @@
    "referenced_type" : "_ZTIFvPKcE",
    "self_type" : "_ZTIPFvPKcE",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1826,7 +1826,7 @@
    "referenced_type" : "_ZTIK11EventTagMap",
    "self_type" : "_ZTIPK11EventTagMap",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1835,7 +1835,7 @@
    "referenced_type" : "_ZTIK17AndroidLogEntry_t",
    "self_type" : "_ZTIPK17AndroidLogEntry_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1844,7 +1844,7 @@
    "referenced_type" : "_ZTIK21__android_log_message",
    "self_type" : "_ZTIPK21__android_log_message",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1853,7 +1853,7 @@
    "referenced_type" : "_ZTIK22android_log_event_list",
    "self_type" : "_ZTIPK22android_log_event_list",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1862,7 +1862,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,
@@ -1871,7 +1871,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,
@@ -1880,7 +1880,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -1889,7 +1889,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   },
   {
    "alignment" : 4,
@@ -1898,7 +1898,7 @@
    "referenced_type" : "_ZTIP28android_log_context_internal",
    "self_type" : "_ZTIPP28android_log_context_internal",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1907,7 +1907,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -1916,7 +1916,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
@@ -1925,7 +1925,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1934,7 +1934,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   }
  ],
  "qualified_types" :
@@ -1945,7 +1945,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"
   },
   {
    "is_const" : true,
@@ -1953,7 +1953,7 @@
    "name" : "const EventTagMap",
    "referenced_type" : "_ZTI11EventTagMap",
    "self_type" : "_ZTIK11EventTagMap",
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1963,7 +1963,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTIK17AndroidLogEntry_t",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 4,
@@ -1973,7 +1973,7 @@
    "referenced_type" : "_ZTI21__android_log_message",
    "self_type" : "_ZTIK21__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,
@@ -1983,7 +1983,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTIK22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -1993,7 +1993,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,
@@ -2003,7 +2003,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,
@@ -2013,7 +2013,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,
@@ -2023,7 +2023,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2033,7 +2033,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/logging/liblog/include/android/log.h"
+   "source_file" : "/system/core/liblog/include/android/log.h"
   },
   {
    "alignment" : 4,
@@ -2043,7 +2043,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"
   },
   {
    "is_const" : true,
@@ -2051,7 +2051,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "/system/logging/liblog/include/log/log.h"
+   "source_file" : "/system/core/liblog/include/log/log.h"
   }
  ],
  "record_types" :
@@ -2105,7 +2105,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,
@@ -2166,7 +2166,7 @@
    "referenced_type" : "_ZTI17AndroidLogEntry_t",
    "self_type" : "_ZTI17AndroidLogEntry_t",
    "size" : 40,
-   "source_file" : "/system/logging/liblog/include/log/logprint.h"
+   "source_file" : "/system/core/liblog/include/log/logprint.h"
   },
   {
    "alignment" : 1,
@@ -2187,7 +2187,7 @@
    "referenced_type" : "_ZTI19android_event_int_t",
    "self_type" : "_ZTI19android_event_int_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2208,7 +2208,7 @@
    "referenced_type" : "_ZTI20android_event_list_t",
    "self_type" : "_ZTI20android_event_list_t",
    "size" : 2,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2229,7 +2229,7 @@
    "referenced_type" : "_ZTI20android_event_long_t",
    "self_type" : "_ZTI20android_event_long_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2255,7 +2255,7 @@
    "referenced_type" : "_ZTI20android_log_header_t",
    "self_type" : "_ZTI20android_log_header_t",
    "size" : 11,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2301,7 +2301,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" : 1,
@@ -2322,7 +2322,7 @@
    "referenced_type" : "_ZTI21android_event_float_t",
    "self_type" : "_ZTI21android_event_float_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2338,7 +2338,7 @@
    "referenced_type" : "_ZTI22android_event_header_t",
    "self_type" : "_ZTI22android_event_header_t",
    "size" : 4,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2364,7 +2364,7 @@
    "referenced_type" : "_ZTI22android_event_string_t",
    "self_type" : "_ZTI22android_event_string_t",
    "size" : 5,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2388,7 +2388,7 @@
    "referenced_type" : "_ZTI22android_log_event_list",
    "self_type" : "_ZTI22android_log_event_list",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2409,7 +2409,7 @@
    "referenced_type" : "_ZTI23android_log_event_int_t",
    "self_type" : "_ZTI23android_log_event_int_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2430,7 +2430,7 @@
    "referenced_type" : "_ZTI24android_log_event_long_t",
    "self_type" : "_ZTI24android_log_event_long_t",
    "size" : 13,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2461,7 +2461,7 @@
    "referenced_type" : "_ZTI24android_log_list_element",
    "self_type" : "_ZTI24android_log_list_element",
    "size" : 16,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 1,
@@ -2492,7 +2492,7 @@
    "referenced_type" : "_ZTI25android_pmsg_log_header_t",
    "self_type" : "_ZTI25android_pmsg_log_header_t",
    "size" : 7,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 1,
@@ -2523,7 +2523,7 @@
    "referenced_type" : "_ZTI26android_log_event_string_t",
    "self_type" : "_ZTI26android_log_event_string_t",
    "size" : 9,
-   "source_file" : "/system/logging/liblog/include/private/android_logger.h"
+   "source_file" : "/system/core/liblog/include/private/android_logger.h"
   },
   {
    "alignment" : 4,
@@ -2538,7 +2538,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" : 1,
@@ -2559,7 +2559,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,
@@ -2584,12 +2584,12 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTIN24android_log_list_elementUt_E",
-   "name" : "android_log_list_element::(anonymous union at system/logging/liblog/include/log/log_event_list.h:48:3)",
+   "name" : "android_log_list_element::(anonymous union at system/core/liblog/include/log/log_event_list.h:48:3)",
    "record_kind" : "union",
    "referenced_type" : "_ZTIN24android_log_list_elementUt_E",
    "self_type" : "_ZTIN24android_log_list_elementUt_E",
    "size" : 8,
-   "source_file" : "/system/logging/liblog/include/log/log_event_list.h"
+   "source_file" : "/system/core/liblog/include/log/log_event_list.h"
   },
   {
    "alignment" : 4,
@@ -2606,12 +2606,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"
   }
  ],
  "rvalue_reference_types" : []