diff --git a/30/32/arm_armv7-a-neon/source-based/libdexfile_external.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libdexfile_external.so.lsdump
index 27cb135..061d911 100644
--- a/30/32/arm_armv7-a-neon/source-based/libdexfile_external.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libdexfile_external.so.lsdump
@@ -163,7 +163,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -378,7 +378,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -387,7 +387,7 @@
    "referenced_type" : "_ZTINSt3__15mutexE",
    "self_type" : "_ZTIRNSt3__15mutexE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "pointer_types" :
@@ -417,7 +417,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -426,7 +426,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -462,7 +462,7 @@
    "referenced_type" : "_ZTIKN3art3dex6TypeIdE",
    "self_type" : "_ZTIPKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -471,7 +471,7 @@
    "referenced_type" : "_ZTIKN3art3dex7FieldIdE",
    "self_type" : "_ZTIPKN3art3dex7FieldIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -480,7 +480,7 @@
    "referenced_type" : "_ZTIKN3art3dex7ProtoIdE",
    "self_type" : "_ZTIPKN3art3dex7ProtoIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -489,7 +489,7 @@
    "referenced_type" : "_ZTIKN3art3dex8ClassDefE",
    "self_type" : "_ZTIPKN3art3dex8ClassDefE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -498,7 +498,7 @@
    "referenced_type" : "_ZTIKN3art3dex8MethodIdE",
    "self_type" : "_ZTIPKN3art3dex8MethodIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -507,7 +507,7 @@
    "referenced_type" : "_ZTIKN3art3dex8StringIdE",
    "self_type" : "_ZTIPKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -516,7 +516,7 @@
    "referenced_type" : "_ZTIKN3art7DexFileE",
    "self_type" : "_ZTIPKN3art7DexFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -525,7 +525,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -534,7 +534,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -543,7 +543,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -552,7 +552,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -561,7 +561,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -579,7 +579,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -588,7 +588,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -606,7 +606,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -615,7 +615,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -624,7 +624,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -633,7 +633,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -642,7 +642,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -651,7 +651,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -660,7 +660,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -669,7 +669,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -678,7 +678,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -687,7 +687,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -696,7 +696,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -705,7 +705,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -714,7 +714,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -723,7 +723,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -732,7 +732,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -741,7 +741,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -750,7 +750,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -759,7 +759,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -768,7 +768,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -777,7 +777,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -786,7 +786,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -795,7 +795,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -804,7 +804,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -813,7 +813,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIbbEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -822,7 +822,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -831,7 +831,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -840,7 +840,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -849,7 +849,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -858,7 +858,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -867,7 +867,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIPN7android4base19ScopedLockAssertionE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   },
   {
    "alignment" : 4,
@@ -894,7 +894,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -903,7 +903,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -912,7 +912,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -963,7 +963,7 @@
    "referenced_type" : "_ZTIN3art3dex6TypeIdE",
    "self_type" : "_ZTIKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -973,7 +973,7 @@
    "referenced_type" : "_ZTIN3art3dex7FieldIdE",
    "self_type" : "_ZTIKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -983,7 +983,7 @@
    "referenced_type" : "_ZTIN3art3dex7ProtoIdE",
    "self_type" : "_ZTIKN3art3dex7ProtoIdE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -993,7 +993,7 @@
    "referenced_type" : "_ZTIN3art3dex8ClassDefE",
    "self_type" : "_ZTIKN3art3dex8ClassDefE",
    "size" : 32,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1003,7 +1003,7 @@
    "referenced_type" : "_ZTIN3art3dex8MethodIdE",
    "self_type" : "_ZTIKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1013,7 +1013,7 @@
    "referenced_type" : "_ZTIN3art3dex8StringIdE",
    "self_type" : "_ZTIKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1023,7 +1023,7 @@
    "referenced_type" : "_ZTIN3art7DexFileE",
    "self_type" : "_ZTIKN3art7DexFileE",
    "size" : 96,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1033,7 +1033,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1043,7 +1043,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1053,7 +1053,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1063,7 +1063,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1073,7 +1073,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1083,7 +1083,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1093,7 +1093,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1113,7 +1113,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1123,7 +1123,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 2,
@@ -1133,7 +1133,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -1188,7 +1188,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1206,7 +1206,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1236,7 +1236,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1253,7 +1253,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -1262,7 +1262,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1280,7 +1280,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1301,7 +1301,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex6TypeIdE", "_ZTIPKN3art3dex6TypeIdE" ]
   },
   {
@@ -1323,7 +1323,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7FieldIdE", "_ZTIPKN3art3dex7FieldIdE" ]
   },
   {
@@ -1345,7 +1345,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7ProtoIdE", "_ZTIPKN3art3dex7ProtoIdE" ]
   },
   {
@@ -1367,7 +1367,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8ClassDefE", "_ZTIPKN3art3dex8ClassDefE" ]
   },
   {
@@ -1389,7 +1389,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8MethodIdE", "_ZTIPKN3art3dex8MethodIdE" ]
   },
   {
@@ -1411,7 +1411,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8StringIdE", "_ZTIPKN3art3dex8StringIdE" ]
   },
   {
@@ -1433,7 +1433,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art7DexFileE", "_ZTIPKN3art7DexFileE" ]
   },
   {
@@ -1455,7 +1455,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -1477,7 +1477,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -1499,7 +1499,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -1521,7 +1521,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -1543,7 +1543,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -1565,7 +1565,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -1587,7 +1587,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKt", "_ZTIPKt" ]
   },
   {
@@ -1609,7 +1609,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -1631,7 +1631,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -1653,7 +1653,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -1675,7 +1675,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -1697,7 +1697,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -1719,7 +1719,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -1741,7 +1741,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIb", "_ZTIb" ]
   },
   {
@@ -1763,7 +1763,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -1785,7 +1785,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIj" ]
   },
   {
@@ -1807,7 +1807,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIj" ]
   },
   {
@@ -1829,7 +1829,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIt" ]
   },
   {
@@ -1848,7 +1848,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -1867,7 +1867,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1877,7 +1877,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "rvalue_reference_types" :
@@ -1889,7 +1889,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   }
  ]
 }
diff --git a/30/32/arm_armv7-a-neon/source-based/libdexfiled_external.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libdexfiled_external.so.lsdump
index 27cb135..061d911 100644
--- a/30/32/arm_armv7-a-neon/source-based/libdexfiled_external.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libdexfiled_external.so.lsdump
@@ -163,7 +163,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -378,7 +378,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -387,7 +387,7 @@
    "referenced_type" : "_ZTINSt3__15mutexE",
    "self_type" : "_ZTIRNSt3__15mutexE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "pointer_types" :
@@ -417,7 +417,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -426,7 +426,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -462,7 +462,7 @@
    "referenced_type" : "_ZTIKN3art3dex6TypeIdE",
    "self_type" : "_ZTIPKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -471,7 +471,7 @@
    "referenced_type" : "_ZTIKN3art3dex7FieldIdE",
    "self_type" : "_ZTIPKN3art3dex7FieldIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -480,7 +480,7 @@
    "referenced_type" : "_ZTIKN3art3dex7ProtoIdE",
    "self_type" : "_ZTIPKN3art3dex7ProtoIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -489,7 +489,7 @@
    "referenced_type" : "_ZTIKN3art3dex8ClassDefE",
    "self_type" : "_ZTIPKN3art3dex8ClassDefE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -498,7 +498,7 @@
    "referenced_type" : "_ZTIKN3art3dex8MethodIdE",
    "self_type" : "_ZTIPKN3art3dex8MethodIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -507,7 +507,7 @@
    "referenced_type" : "_ZTIKN3art3dex8StringIdE",
    "self_type" : "_ZTIPKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -516,7 +516,7 @@
    "referenced_type" : "_ZTIKN3art7DexFileE",
    "self_type" : "_ZTIPKN3art7DexFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -525,7 +525,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -534,7 +534,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -543,7 +543,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -552,7 +552,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -561,7 +561,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -579,7 +579,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -588,7 +588,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -606,7 +606,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -615,7 +615,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -624,7 +624,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -633,7 +633,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -642,7 +642,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -651,7 +651,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -660,7 +660,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -669,7 +669,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -678,7 +678,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -687,7 +687,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -696,7 +696,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -705,7 +705,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -714,7 +714,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -723,7 +723,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -732,7 +732,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -741,7 +741,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -750,7 +750,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -759,7 +759,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -768,7 +768,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -777,7 +777,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -786,7 +786,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -795,7 +795,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -804,7 +804,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -813,7 +813,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIbbEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -822,7 +822,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -831,7 +831,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -840,7 +840,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -849,7 +849,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -858,7 +858,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -867,7 +867,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIPN7android4base19ScopedLockAssertionE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   },
   {
    "alignment" : 4,
@@ -894,7 +894,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -903,7 +903,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -912,7 +912,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -963,7 +963,7 @@
    "referenced_type" : "_ZTIN3art3dex6TypeIdE",
    "self_type" : "_ZTIKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -973,7 +973,7 @@
    "referenced_type" : "_ZTIN3art3dex7FieldIdE",
    "self_type" : "_ZTIKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -983,7 +983,7 @@
    "referenced_type" : "_ZTIN3art3dex7ProtoIdE",
    "self_type" : "_ZTIKN3art3dex7ProtoIdE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -993,7 +993,7 @@
    "referenced_type" : "_ZTIN3art3dex8ClassDefE",
    "self_type" : "_ZTIKN3art3dex8ClassDefE",
    "size" : 32,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1003,7 +1003,7 @@
    "referenced_type" : "_ZTIN3art3dex8MethodIdE",
    "self_type" : "_ZTIKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1013,7 +1013,7 @@
    "referenced_type" : "_ZTIN3art3dex8StringIdE",
    "self_type" : "_ZTIKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1023,7 +1023,7 @@
    "referenced_type" : "_ZTIN3art7DexFileE",
    "self_type" : "_ZTIKN3art7DexFileE",
    "size" : 96,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1033,7 +1033,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1043,7 +1043,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1053,7 +1053,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1063,7 +1063,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1073,7 +1073,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1083,7 +1083,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1093,7 +1093,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1113,7 +1113,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1123,7 +1123,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 2,
@@ -1133,7 +1133,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -1188,7 +1188,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1206,7 +1206,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1236,7 +1236,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1253,7 +1253,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -1262,7 +1262,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1280,7 +1280,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1301,7 +1301,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex6TypeIdE", "_ZTIPKN3art3dex6TypeIdE" ]
   },
   {
@@ -1323,7 +1323,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7FieldIdE", "_ZTIPKN3art3dex7FieldIdE" ]
   },
   {
@@ -1345,7 +1345,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7ProtoIdE", "_ZTIPKN3art3dex7ProtoIdE" ]
   },
   {
@@ -1367,7 +1367,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8ClassDefE", "_ZTIPKN3art3dex8ClassDefE" ]
   },
   {
@@ -1389,7 +1389,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8MethodIdE", "_ZTIPKN3art3dex8MethodIdE" ]
   },
   {
@@ -1411,7 +1411,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8StringIdE", "_ZTIPKN3art3dex8StringIdE" ]
   },
   {
@@ -1433,7 +1433,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art7DexFileE", "_ZTIPKN3art7DexFileE" ]
   },
   {
@@ -1455,7 +1455,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -1477,7 +1477,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -1499,7 +1499,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -1521,7 +1521,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -1543,7 +1543,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -1565,7 +1565,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -1587,7 +1587,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKt", "_ZTIPKt" ]
   },
   {
@@ -1609,7 +1609,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -1631,7 +1631,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -1653,7 +1653,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -1675,7 +1675,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -1697,7 +1697,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -1719,7 +1719,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -1741,7 +1741,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIb", "_ZTIb" ]
   },
   {
@@ -1763,7 +1763,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -1785,7 +1785,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIj" ]
   },
   {
@@ -1807,7 +1807,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIj" ]
   },
   {
@@ -1829,7 +1829,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIt" ]
   },
   {
@@ -1848,7 +1848,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -1867,7 +1867,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1877,7 +1877,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "rvalue_reference_types" :
@@ -1889,7 +1889,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   }
  ]
 }
diff --git a/30/32/x86/source-based/libdexfile_external.so.lsdump b/30/32/x86/source-based/libdexfile_external.so.lsdump
index a687330..e73bcbe 100644
--- a/30/32/x86/source-based/libdexfile_external.so.lsdump
+++ b/30/32/x86/source-based/libdexfile_external.so.lsdump
@@ -162,7 +162,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -195,7 +195,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -377,7 +377,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -386,7 +386,7 @@
    "referenced_type" : "_ZTINSt3__15mutexE",
    "self_type" : "_ZTIRNSt3__15mutexE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "pointer_types" :
@@ -416,7 +416,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -425,7 +425,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -461,7 +461,7 @@
    "referenced_type" : "_ZTIKN3art3dex6TypeIdE",
    "self_type" : "_ZTIPKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -470,7 +470,7 @@
    "referenced_type" : "_ZTIKN3art3dex7FieldIdE",
    "self_type" : "_ZTIPKN3art3dex7FieldIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -479,7 +479,7 @@
    "referenced_type" : "_ZTIKN3art3dex7ProtoIdE",
    "self_type" : "_ZTIPKN3art3dex7ProtoIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -488,7 +488,7 @@
    "referenced_type" : "_ZTIKN3art3dex8ClassDefE",
    "self_type" : "_ZTIPKN3art3dex8ClassDefE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -497,7 +497,7 @@
    "referenced_type" : "_ZTIKN3art3dex8MethodIdE",
    "self_type" : "_ZTIPKN3art3dex8MethodIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -506,7 +506,7 @@
    "referenced_type" : "_ZTIKN3art3dex8StringIdE",
    "self_type" : "_ZTIPKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -515,7 +515,7 @@
    "referenced_type" : "_ZTIKN3art7DexFileE",
    "self_type" : "_ZTIPKN3art7DexFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -524,7 +524,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -533,7 +533,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -542,7 +542,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -551,7 +551,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -560,7 +560,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -578,7 +578,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -587,7 +587,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -605,7 +605,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -614,7 +614,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -623,7 +623,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -632,7 +632,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -641,7 +641,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -650,7 +650,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -659,7 +659,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -668,7 +668,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -677,7 +677,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -686,7 +686,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -695,7 +695,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -704,7 +704,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -713,7 +713,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -722,7 +722,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -731,7 +731,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -740,7 +740,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -749,7 +749,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -758,7 +758,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -767,7 +767,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -776,7 +776,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -785,7 +785,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -794,7 +794,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -803,7 +803,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -812,7 +812,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIbbEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -821,7 +821,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -830,7 +830,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -839,7 +839,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -848,7 +848,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -857,7 +857,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -866,7 +866,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIPN7android4base19ScopedLockAssertionE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   },
   {
    "alignment" : 4,
@@ -893,7 +893,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -902,7 +902,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -911,7 +911,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -962,7 +962,7 @@
    "referenced_type" : "_ZTIN3art3dex6TypeIdE",
    "self_type" : "_ZTIKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -972,7 +972,7 @@
    "referenced_type" : "_ZTIN3art3dex7FieldIdE",
    "self_type" : "_ZTIKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -982,7 +982,7 @@
    "referenced_type" : "_ZTIN3art3dex7ProtoIdE",
    "self_type" : "_ZTIKN3art3dex7ProtoIdE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -992,7 +992,7 @@
    "referenced_type" : "_ZTIN3art3dex8ClassDefE",
    "self_type" : "_ZTIKN3art3dex8ClassDefE",
    "size" : 32,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1002,7 +1002,7 @@
    "referenced_type" : "_ZTIN3art3dex8MethodIdE",
    "self_type" : "_ZTIKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1012,7 +1012,7 @@
    "referenced_type" : "_ZTIN3art3dex8StringIdE",
    "self_type" : "_ZTIKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1022,7 +1022,7 @@
    "referenced_type" : "_ZTIN3art7DexFileE",
    "self_type" : "_ZTIKN3art7DexFileE",
    "size" : 96,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1032,7 +1032,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1042,7 +1042,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1052,7 +1052,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1062,7 +1062,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1072,7 +1072,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1082,7 +1082,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1092,7 +1092,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1112,7 +1112,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1122,7 +1122,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 2,
@@ -1132,7 +1132,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -1187,7 +1187,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1205,7 +1205,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1235,7 +1235,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1252,7 +1252,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -1261,7 +1261,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1279,7 +1279,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1300,7 +1300,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex6TypeIdE", "_ZTIPKN3art3dex6TypeIdE" ]
   },
   {
@@ -1322,7 +1322,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7FieldIdE", "_ZTIPKN3art3dex7FieldIdE" ]
   },
   {
@@ -1344,7 +1344,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7ProtoIdE", "_ZTIPKN3art3dex7ProtoIdE" ]
   },
   {
@@ -1366,7 +1366,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8ClassDefE", "_ZTIPKN3art3dex8ClassDefE" ]
   },
   {
@@ -1388,7 +1388,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8MethodIdE", "_ZTIPKN3art3dex8MethodIdE" ]
   },
   {
@@ -1410,7 +1410,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8StringIdE", "_ZTIPKN3art3dex8StringIdE" ]
   },
   {
@@ -1432,7 +1432,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art7DexFileE", "_ZTIPKN3art7DexFileE" ]
   },
   {
@@ -1454,7 +1454,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -1476,7 +1476,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -1498,7 +1498,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -1520,7 +1520,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -1542,7 +1542,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -1564,7 +1564,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -1586,7 +1586,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKt", "_ZTIPKt" ]
   },
   {
@@ -1608,7 +1608,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -1630,7 +1630,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -1652,7 +1652,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -1674,7 +1674,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -1696,7 +1696,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -1718,7 +1718,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -1740,7 +1740,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIb", "_ZTIb" ]
   },
   {
@@ -1762,7 +1762,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -1784,7 +1784,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIj" ]
   },
   {
@@ -1806,7 +1806,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIj" ]
   },
   {
@@ -1828,7 +1828,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIt" ]
   },
   {
@@ -1847,7 +1847,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -1866,7 +1866,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1876,7 +1876,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "rvalue_reference_types" :
@@ -1888,7 +1888,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   }
  ]
 }
diff --git a/30/32/x86/source-based/libdexfiled_external.so.lsdump b/30/32/x86/source-based/libdexfiled_external.so.lsdump
index a687330..e73bcbe 100644
--- a/30/32/x86/source-based/libdexfiled_external.so.lsdump
+++ b/30/32/x86/source-based/libdexfiled_external.so.lsdump
@@ -162,7 +162,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -195,7 +195,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -377,7 +377,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -386,7 +386,7 @@
    "referenced_type" : "_ZTINSt3__15mutexE",
    "self_type" : "_ZTIRNSt3__15mutexE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "pointer_types" :
@@ -416,7 +416,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -425,7 +425,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -461,7 +461,7 @@
    "referenced_type" : "_ZTIKN3art3dex6TypeIdE",
    "self_type" : "_ZTIPKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -470,7 +470,7 @@
    "referenced_type" : "_ZTIKN3art3dex7FieldIdE",
    "self_type" : "_ZTIPKN3art3dex7FieldIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -479,7 +479,7 @@
    "referenced_type" : "_ZTIKN3art3dex7ProtoIdE",
    "self_type" : "_ZTIPKN3art3dex7ProtoIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -488,7 +488,7 @@
    "referenced_type" : "_ZTIKN3art3dex8ClassDefE",
    "self_type" : "_ZTIPKN3art3dex8ClassDefE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -497,7 +497,7 @@
    "referenced_type" : "_ZTIKN3art3dex8MethodIdE",
    "self_type" : "_ZTIPKN3art3dex8MethodIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -506,7 +506,7 @@
    "referenced_type" : "_ZTIKN3art3dex8StringIdE",
    "self_type" : "_ZTIPKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -515,7 +515,7 @@
    "referenced_type" : "_ZTIKN3art7DexFileE",
    "self_type" : "_ZTIPKN3art7DexFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -524,7 +524,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -533,7 +533,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -542,7 +542,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -551,7 +551,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -560,7 +560,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -578,7 +578,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -587,7 +587,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -605,7 +605,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -614,7 +614,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -623,7 +623,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -632,7 +632,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -641,7 +641,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -650,7 +650,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -659,7 +659,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -668,7 +668,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -677,7 +677,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -686,7 +686,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -695,7 +695,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -704,7 +704,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -713,7 +713,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -722,7 +722,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -731,7 +731,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -740,7 +740,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -749,7 +749,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -758,7 +758,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -767,7 +767,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -776,7 +776,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -785,7 +785,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -794,7 +794,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -803,7 +803,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -812,7 +812,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIbbEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -821,7 +821,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -830,7 +830,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -839,7 +839,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -848,7 +848,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -857,7 +857,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -866,7 +866,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIPN7android4base19ScopedLockAssertionE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   },
   {
    "alignment" : 4,
@@ -893,7 +893,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -902,7 +902,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -911,7 +911,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -962,7 +962,7 @@
    "referenced_type" : "_ZTIN3art3dex6TypeIdE",
    "self_type" : "_ZTIKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -972,7 +972,7 @@
    "referenced_type" : "_ZTIN3art3dex7FieldIdE",
    "self_type" : "_ZTIKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -982,7 +982,7 @@
    "referenced_type" : "_ZTIN3art3dex7ProtoIdE",
    "self_type" : "_ZTIKN3art3dex7ProtoIdE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -992,7 +992,7 @@
    "referenced_type" : "_ZTIN3art3dex8ClassDefE",
    "self_type" : "_ZTIKN3art3dex8ClassDefE",
    "size" : 32,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1002,7 +1002,7 @@
    "referenced_type" : "_ZTIN3art3dex8MethodIdE",
    "self_type" : "_ZTIKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1012,7 +1012,7 @@
    "referenced_type" : "_ZTIN3art3dex8StringIdE",
    "self_type" : "_ZTIKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1022,7 +1022,7 @@
    "referenced_type" : "_ZTIN3art7DexFileE",
    "self_type" : "_ZTIKN3art7DexFileE",
    "size" : 96,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1032,7 +1032,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1042,7 +1042,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1052,7 +1052,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1062,7 +1062,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1072,7 +1072,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1082,7 +1082,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1092,7 +1092,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1112,7 +1112,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1122,7 +1122,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 2,
@@ -1132,7 +1132,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -1187,7 +1187,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1205,7 +1205,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1235,7 +1235,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1252,7 +1252,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -1261,7 +1261,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1279,7 +1279,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1300,7 +1300,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex6TypeIdE", "_ZTIPKN3art3dex6TypeIdE" ]
   },
   {
@@ -1322,7 +1322,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7FieldIdE", "_ZTIPKN3art3dex7FieldIdE" ]
   },
   {
@@ -1344,7 +1344,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7ProtoIdE", "_ZTIPKN3art3dex7ProtoIdE" ]
   },
   {
@@ -1366,7 +1366,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8ClassDefE", "_ZTIPKN3art3dex8ClassDefE" ]
   },
   {
@@ -1388,7 +1388,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8MethodIdE", "_ZTIPKN3art3dex8MethodIdE" ]
   },
   {
@@ -1410,7 +1410,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8StringIdE", "_ZTIPKN3art3dex8StringIdE" ]
   },
   {
@@ -1432,7 +1432,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art7DexFileE", "_ZTIPKN3art7DexFileE" ]
   },
   {
@@ -1454,7 +1454,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -1476,7 +1476,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -1498,7 +1498,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -1520,7 +1520,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -1542,7 +1542,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -1564,7 +1564,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -1586,7 +1586,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKt", "_ZTIPKt" ]
   },
   {
@@ -1608,7 +1608,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -1630,7 +1630,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -1652,7 +1652,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -1674,7 +1674,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -1696,7 +1696,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -1718,7 +1718,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -1740,7 +1740,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIb", "_ZTIb" ]
   },
   {
@@ -1762,7 +1762,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -1784,7 +1784,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIj" ]
   },
   {
@@ -1806,7 +1806,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIj" ]
   },
   {
@@ -1828,7 +1828,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIt" ]
   },
   {
@@ -1847,7 +1847,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -1866,7 +1866,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1876,7 +1876,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "rvalue_reference_types" :
@@ -1888,7 +1888,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   }
  ]
 }
diff --git a/30/64/arm64_armv8-a/source-based/libdexfile_external.so.lsdump b/30/64/arm64_armv8-a/source-based/libdexfile_external.so.lsdump
index 7ffb879..e56f633 100644
--- a/30/64/arm64_armv8-a/source-based/libdexfile_external.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libdexfile_external.so.lsdump
@@ -164,7 +164,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -197,7 +197,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -379,7 +379,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -388,7 +388,7 @@
    "referenced_type" : "_ZTINSt3__15mutexE",
    "self_type" : "_ZTIRNSt3__15mutexE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "pointer_types" :
@@ -418,7 +418,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -427,7 +427,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -463,7 +463,7 @@
    "referenced_type" : "_ZTIKN3art3dex6TypeIdE",
    "self_type" : "_ZTIPKN3art3dex6TypeIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -472,7 +472,7 @@
    "referenced_type" : "_ZTIKN3art3dex7FieldIdE",
    "self_type" : "_ZTIPKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -481,7 +481,7 @@
    "referenced_type" : "_ZTIKN3art3dex7ProtoIdE",
    "self_type" : "_ZTIPKN3art3dex7ProtoIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -490,7 +490,7 @@
    "referenced_type" : "_ZTIKN3art3dex8ClassDefE",
    "self_type" : "_ZTIPKN3art3dex8ClassDefE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -499,7 +499,7 @@
    "referenced_type" : "_ZTIKN3art3dex8MethodIdE",
    "self_type" : "_ZTIPKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -508,7 +508,7 @@
    "referenced_type" : "_ZTIKN3art3dex8StringIdE",
    "self_type" : "_ZTIPKN3art3dex8StringIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -517,7 +517,7 @@
    "referenced_type" : "_ZTIKN3art7DexFileE",
    "self_type" : "_ZTIPKN3art7DexFileE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -526,7 +526,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -535,7 +535,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -544,7 +544,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -553,7 +553,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -562,7 +562,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -580,7 +580,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -589,7 +589,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -607,7 +607,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -616,7 +616,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -625,7 +625,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -634,7 +634,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -643,7 +643,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -652,7 +652,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -661,7 +661,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -670,7 +670,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -679,7 +679,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -688,7 +688,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -697,7 +697,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -706,7 +706,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -715,7 +715,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -724,7 +724,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -733,7 +733,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -742,7 +742,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -751,7 +751,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -760,7 +760,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -769,7 +769,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -778,7 +778,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -787,7 +787,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -796,7 +796,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -805,7 +805,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -814,7 +814,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIbbEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -823,7 +823,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -832,7 +832,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjmEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjmEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -841,7 +841,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIliEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIliEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -850,7 +850,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorImjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorImjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -859,7 +859,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorImmEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorImmEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -868,7 +868,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -877,7 +877,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItmEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItmEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -886,7 +886,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIttEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -895,7 +895,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -904,7 +904,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIPN7android4base19ScopedLockAssertionE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   },
   {
    "alignment" : 8,
@@ -931,7 +931,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -940,7 +940,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -949,7 +949,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1000,7 +1000,7 @@
    "referenced_type" : "_ZTIN3art3dex6TypeIdE",
    "self_type" : "_ZTIKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1010,7 +1010,7 @@
    "referenced_type" : "_ZTIN3art3dex7FieldIdE",
    "self_type" : "_ZTIKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1020,7 +1020,7 @@
    "referenced_type" : "_ZTIN3art3dex7ProtoIdE",
    "self_type" : "_ZTIKN3art3dex7ProtoIdE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1030,7 +1030,7 @@
    "referenced_type" : "_ZTIN3art3dex8ClassDefE",
    "self_type" : "_ZTIKN3art3dex8ClassDefE",
    "size" : 32,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1040,7 +1040,7 @@
    "referenced_type" : "_ZTIN3art3dex8MethodIdE",
    "self_type" : "_ZTIKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1050,7 +1050,7 @@
    "referenced_type" : "_ZTIN3art3dex8StringIdE",
    "self_type" : "_ZTIKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1060,7 +1060,7 @@
    "referenced_type" : "_ZTIN3art7DexFileE",
    "self_type" : "_ZTIKN3art7DexFileE",
    "size" : 192,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1070,7 +1070,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 24,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1080,7 +1080,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1090,7 +1090,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -1100,7 +1100,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1110,7 +1110,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 24,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1120,7 +1120,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1130,7 +1130,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1150,7 +1150,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1160,7 +1160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 2,
@@ -1170,7 +1170,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -1225,7 +1225,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1243,7 +1243,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1273,7 +1273,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 24,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1290,7 +1290,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -1299,7 +1299,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1317,7 +1317,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -1338,7 +1338,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex6TypeIdE", "_ZTIPKN3art3dex6TypeIdE" ]
   },
   {
@@ -1360,7 +1360,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7FieldIdE", "_ZTIPKN3art3dex7FieldIdE" ]
   },
   {
@@ -1382,7 +1382,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7ProtoIdE", "_ZTIPKN3art3dex7ProtoIdE" ]
   },
   {
@@ -1404,7 +1404,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8ClassDefE", "_ZTIPKN3art3dex8ClassDefE" ]
   },
   {
@@ -1426,7 +1426,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8MethodIdE", "_ZTIPKN3art3dex8MethodIdE" ]
   },
   {
@@ -1448,7 +1448,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8StringIdE", "_ZTIPKN3art3dex8StringIdE" ]
   },
   {
@@ -1470,7 +1470,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art7DexFileE", "_ZTIPKN3art7DexFileE" ]
   },
   {
@@ -1492,7 +1492,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -1514,7 +1514,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -1536,7 +1536,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -1558,7 +1558,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -1580,7 +1580,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -1602,7 +1602,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -1624,7 +1624,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKt", "_ZTIPKt" ]
   },
   {
@@ -1646,7 +1646,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -1668,7 +1668,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -1690,7 +1690,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -1712,7 +1712,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -1734,7 +1734,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -1756,7 +1756,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -1778,7 +1778,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIb", "_ZTIb" ]
   },
   {
@@ -1800,7 +1800,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIj" ]
   },
   {
@@ -1822,7 +1822,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjmEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjmEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIm" ]
   },
   {
@@ -1844,7 +1844,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIliEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIliEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIl", "_ZTIi" ]
   },
   {
@@ -1866,7 +1866,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorImjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorImjEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIm", "_ZTIj" ]
   },
   {
@@ -1888,7 +1888,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorImmEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorImmEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIm", "_ZTIm" ]
   },
   {
@@ -1910,7 +1910,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIj" ]
   },
   {
@@ -1932,7 +1932,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItmEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItmEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIm" ]
   },
   {
@@ -1954,7 +1954,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIt" ]
   },
   {
@@ -1973,7 +1973,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -1992,7 +1992,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -2002,7 +2002,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "rvalue_reference_types" :
@@ -2014,7 +2014,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   }
  ]
 }
diff --git a/30/64/arm64_armv8-a/source-based/libdexfiled_external.so.lsdump b/30/64/arm64_armv8-a/source-based/libdexfiled_external.so.lsdump
index 7ffb879..e56f633 100644
--- a/30/64/arm64_armv8-a/source-based/libdexfiled_external.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libdexfiled_external.so.lsdump
@@ -164,7 +164,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -197,7 +197,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -379,7 +379,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -388,7 +388,7 @@
    "referenced_type" : "_ZTINSt3__15mutexE",
    "self_type" : "_ZTIRNSt3__15mutexE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "pointer_types" :
@@ -418,7 +418,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -427,7 +427,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -463,7 +463,7 @@
    "referenced_type" : "_ZTIKN3art3dex6TypeIdE",
    "self_type" : "_ZTIPKN3art3dex6TypeIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -472,7 +472,7 @@
    "referenced_type" : "_ZTIKN3art3dex7FieldIdE",
    "self_type" : "_ZTIPKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -481,7 +481,7 @@
    "referenced_type" : "_ZTIKN3art3dex7ProtoIdE",
    "self_type" : "_ZTIPKN3art3dex7ProtoIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -490,7 +490,7 @@
    "referenced_type" : "_ZTIKN3art3dex8ClassDefE",
    "self_type" : "_ZTIPKN3art3dex8ClassDefE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -499,7 +499,7 @@
    "referenced_type" : "_ZTIKN3art3dex8MethodIdE",
    "self_type" : "_ZTIPKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -508,7 +508,7 @@
    "referenced_type" : "_ZTIKN3art3dex8StringIdE",
    "self_type" : "_ZTIPKN3art3dex8StringIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -517,7 +517,7 @@
    "referenced_type" : "_ZTIKN3art7DexFileE",
    "self_type" : "_ZTIPKN3art7DexFileE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -526,7 +526,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -535,7 +535,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -544,7 +544,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -553,7 +553,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -562,7 +562,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -580,7 +580,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -589,7 +589,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -607,7 +607,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -616,7 +616,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -625,7 +625,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -634,7 +634,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -643,7 +643,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -652,7 +652,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -661,7 +661,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -670,7 +670,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -679,7 +679,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -688,7 +688,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -697,7 +697,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -706,7 +706,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -715,7 +715,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -724,7 +724,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -733,7 +733,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -742,7 +742,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -751,7 +751,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -760,7 +760,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -769,7 +769,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -778,7 +778,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -787,7 +787,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -796,7 +796,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -805,7 +805,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -814,7 +814,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIbbEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -823,7 +823,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -832,7 +832,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjmEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjmEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -841,7 +841,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIliEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIliEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -850,7 +850,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorImjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorImjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -859,7 +859,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorImmEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorImmEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -868,7 +868,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -877,7 +877,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItmEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItmEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -886,7 +886,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIttEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -895,7 +895,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -904,7 +904,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIPN7android4base19ScopedLockAssertionE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   },
   {
    "alignment" : 8,
@@ -931,7 +931,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -940,7 +940,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -949,7 +949,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1000,7 +1000,7 @@
    "referenced_type" : "_ZTIN3art3dex6TypeIdE",
    "self_type" : "_ZTIKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1010,7 +1010,7 @@
    "referenced_type" : "_ZTIN3art3dex7FieldIdE",
    "self_type" : "_ZTIKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1020,7 +1020,7 @@
    "referenced_type" : "_ZTIN3art3dex7ProtoIdE",
    "self_type" : "_ZTIKN3art3dex7ProtoIdE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1030,7 +1030,7 @@
    "referenced_type" : "_ZTIN3art3dex8ClassDefE",
    "self_type" : "_ZTIKN3art3dex8ClassDefE",
    "size" : 32,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1040,7 +1040,7 @@
    "referenced_type" : "_ZTIN3art3dex8MethodIdE",
    "self_type" : "_ZTIKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1050,7 +1050,7 @@
    "referenced_type" : "_ZTIN3art3dex8StringIdE",
    "self_type" : "_ZTIKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1060,7 +1060,7 @@
    "referenced_type" : "_ZTIN3art7DexFileE",
    "self_type" : "_ZTIKN3art7DexFileE",
    "size" : 192,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1070,7 +1070,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 24,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1080,7 +1080,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1090,7 +1090,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -1100,7 +1100,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1110,7 +1110,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 24,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1120,7 +1120,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1130,7 +1130,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1150,7 +1150,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1160,7 +1160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 2,
@@ -1170,7 +1170,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -1225,7 +1225,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1243,7 +1243,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1273,7 +1273,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 24,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1290,7 +1290,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -1299,7 +1299,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1317,7 +1317,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -1338,7 +1338,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex6TypeIdE", "_ZTIPKN3art3dex6TypeIdE" ]
   },
   {
@@ -1360,7 +1360,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7FieldIdE", "_ZTIPKN3art3dex7FieldIdE" ]
   },
   {
@@ -1382,7 +1382,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7ProtoIdE", "_ZTIPKN3art3dex7ProtoIdE" ]
   },
   {
@@ -1404,7 +1404,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8ClassDefE", "_ZTIPKN3art3dex8ClassDefE" ]
   },
   {
@@ -1426,7 +1426,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8MethodIdE", "_ZTIPKN3art3dex8MethodIdE" ]
   },
   {
@@ -1448,7 +1448,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8StringIdE", "_ZTIPKN3art3dex8StringIdE" ]
   },
   {
@@ -1470,7 +1470,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art7DexFileE", "_ZTIPKN3art7DexFileE" ]
   },
   {
@@ -1492,7 +1492,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -1514,7 +1514,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -1536,7 +1536,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -1558,7 +1558,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -1580,7 +1580,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -1602,7 +1602,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -1624,7 +1624,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKt", "_ZTIPKt" ]
   },
   {
@@ -1646,7 +1646,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -1668,7 +1668,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -1690,7 +1690,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -1712,7 +1712,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -1734,7 +1734,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -1756,7 +1756,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -1778,7 +1778,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIb", "_ZTIb" ]
   },
   {
@@ -1800,7 +1800,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIj" ]
   },
   {
@@ -1822,7 +1822,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjmEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjmEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIm" ]
   },
   {
@@ -1844,7 +1844,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIliEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIliEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIl", "_ZTIi" ]
   },
   {
@@ -1866,7 +1866,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorImjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorImjEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIm", "_ZTIj" ]
   },
   {
@@ -1888,7 +1888,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorImmEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorImmEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIm", "_ZTIm" ]
   },
   {
@@ -1910,7 +1910,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIj" ]
   },
   {
@@ -1932,7 +1932,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItmEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItmEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIm" ]
   },
   {
@@ -1954,7 +1954,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIt" ]
   },
   {
@@ -1973,7 +1973,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -1992,7 +1992,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -2002,7 +2002,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "rvalue_reference_types" :
@@ -2014,7 +2014,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   }
  ]
 }
diff --git a/30/64/arm_armv7-a-neon/source-based/libdexfile_external.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libdexfile_external.so.lsdump
index 27cb135..061d911 100644
--- a/30/64/arm_armv7-a-neon/source-based/libdexfile_external.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libdexfile_external.so.lsdump
@@ -163,7 +163,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -378,7 +378,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -387,7 +387,7 @@
    "referenced_type" : "_ZTINSt3__15mutexE",
    "self_type" : "_ZTIRNSt3__15mutexE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "pointer_types" :
@@ -417,7 +417,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -426,7 +426,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -462,7 +462,7 @@
    "referenced_type" : "_ZTIKN3art3dex6TypeIdE",
    "self_type" : "_ZTIPKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -471,7 +471,7 @@
    "referenced_type" : "_ZTIKN3art3dex7FieldIdE",
    "self_type" : "_ZTIPKN3art3dex7FieldIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -480,7 +480,7 @@
    "referenced_type" : "_ZTIKN3art3dex7ProtoIdE",
    "self_type" : "_ZTIPKN3art3dex7ProtoIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -489,7 +489,7 @@
    "referenced_type" : "_ZTIKN3art3dex8ClassDefE",
    "self_type" : "_ZTIPKN3art3dex8ClassDefE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -498,7 +498,7 @@
    "referenced_type" : "_ZTIKN3art3dex8MethodIdE",
    "self_type" : "_ZTIPKN3art3dex8MethodIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -507,7 +507,7 @@
    "referenced_type" : "_ZTIKN3art3dex8StringIdE",
    "self_type" : "_ZTIPKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -516,7 +516,7 @@
    "referenced_type" : "_ZTIKN3art7DexFileE",
    "self_type" : "_ZTIPKN3art7DexFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -525,7 +525,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -534,7 +534,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -543,7 +543,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -552,7 +552,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -561,7 +561,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -579,7 +579,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -588,7 +588,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -606,7 +606,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -615,7 +615,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -624,7 +624,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -633,7 +633,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -642,7 +642,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -651,7 +651,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -660,7 +660,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -669,7 +669,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -678,7 +678,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -687,7 +687,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -696,7 +696,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -705,7 +705,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -714,7 +714,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -723,7 +723,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -732,7 +732,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -741,7 +741,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -750,7 +750,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -759,7 +759,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -768,7 +768,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -777,7 +777,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -786,7 +786,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -795,7 +795,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -804,7 +804,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -813,7 +813,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIbbEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -822,7 +822,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -831,7 +831,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -840,7 +840,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -849,7 +849,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -858,7 +858,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -867,7 +867,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIPN7android4base19ScopedLockAssertionE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   },
   {
    "alignment" : 4,
@@ -894,7 +894,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -903,7 +903,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -912,7 +912,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -963,7 +963,7 @@
    "referenced_type" : "_ZTIN3art3dex6TypeIdE",
    "self_type" : "_ZTIKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -973,7 +973,7 @@
    "referenced_type" : "_ZTIN3art3dex7FieldIdE",
    "self_type" : "_ZTIKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -983,7 +983,7 @@
    "referenced_type" : "_ZTIN3art3dex7ProtoIdE",
    "self_type" : "_ZTIKN3art3dex7ProtoIdE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -993,7 +993,7 @@
    "referenced_type" : "_ZTIN3art3dex8ClassDefE",
    "self_type" : "_ZTIKN3art3dex8ClassDefE",
    "size" : 32,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1003,7 +1003,7 @@
    "referenced_type" : "_ZTIN3art3dex8MethodIdE",
    "self_type" : "_ZTIKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1013,7 +1013,7 @@
    "referenced_type" : "_ZTIN3art3dex8StringIdE",
    "self_type" : "_ZTIKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1023,7 +1023,7 @@
    "referenced_type" : "_ZTIN3art7DexFileE",
    "self_type" : "_ZTIKN3art7DexFileE",
    "size" : 96,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1033,7 +1033,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1043,7 +1043,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1053,7 +1053,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1063,7 +1063,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1073,7 +1073,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1083,7 +1083,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1093,7 +1093,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1113,7 +1113,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1123,7 +1123,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 2,
@@ -1133,7 +1133,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -1188,7 +1188,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1206,7 +1206,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1236,7 +1236,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1253,7 +1253,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -1262,7 +1262,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1280,7 +1280,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1301,7 +1301,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex6TypeIdE", "_ZTIPKN3art3dex6TypeIdE" ]
   },
   {
@@ -1323,7 +1323,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7FieldIdE", "_ZTIPKN3art3dex7FieldIdE" ]
   },
   {
@@ -1345,7 +1345,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7ProtoIdE", "_ZTIPKN3art3dex7ProtoIdE" ]
   },
   {
@@ -1367,7 +1367,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8ClassDefE", "_ZTIPKN3art3dex8ClassDefE" ]
   },
   {
@@ -1389,7 +1389,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8MethodIdE", "_ZTIPKN3art3dex8MethodIdE" ]
   },
   {
@@ -1411,7 +1411,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8StringIdE", "_ZTIPKN3art3dex8StringIdE" ]
   },
   {
@@ -1433,7 +1433,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art7DexFileE", "_ZTIPKN3art7DexFileE" ]
   },
   {
@@ -1455,7 +1455,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -1477,7 +1477,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -1499,7 +1499,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -1521,7 +1521,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -1543,7 +1543,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -1565,7 +1565,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -1587,7 +1587,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKt", "_ZTIPKt" ]
   },
   {
@@ -1609,7 +1609,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -1631,7 +1631,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -1653,7 +1653,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -1675,7 +1675,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -1697,7 +1697,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -1719,7 +1719,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -1741,7 +1741,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIb", "_ZTIb" ]
   },
   {
@@ -1763,7 +1763,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -1785,7 +1785,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIj" ]
   },
   {
@@ -1807,7 +1807,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIj" ]
   },
   {
@@ -1829,7 +1829,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIt" ]
   },
   {
@@ -1848,7 +1848,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -1867,7 +1867,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1877,7 +1877,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "rvalue_reference_types" :
@@ -1889,7 +1889,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   }
  ]
 }
diff --git a/30/64/arm_armv7-a-neon/source-based/libdexfiled_external.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libdexfiled_external.so.lsdump
index 27cb135..061d911 100644
--- a/30/64/arm_armv7-a-neon/source-based/libdexfiled_external.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libdexfiled_external.so.lsdump
@@ -163,7 +163,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -378,7 +378,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -387,7 +387,7 @@
    "referenced_type" : "_ZTINSt3__15mutexE",
    "self_type" : "_ZTIRNSt3__15mutexE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "pointer_types" :
@@ -417,7 +417,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -426,7 +426,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -462,7 +462,7 @@
    "referenced_type" : "_ZTIKN3art3dex6TypeIdE",
    "self_type" : "_ZTIPKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -471,7 +471,7 @@
    "referenced_type" : "_ZTIKN3art3dex7FieldIdE",
    "self_type" : "_ZTIPKN3art3dex7FieldIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -480,7 +480,7 @@
    "referenced_type" : "_ZTIKN3art3dex7ProtoIdE",
    "self_type" : "_ZTIPKN3art3dex7ProtoIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -489,7 +489,7 @@
    "referenced_type" : "_ZTIKN3art3dex8ClassDefE",
    "self_type" : "_ZTIPKN3art3dex8ClassDefE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -498,7 +498,7 @@
    "referenced_type" : "_ZTIKN3art3dex8MethodIdE",
    "self_type" : "_ZTIPKN3art3dex8MethodIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -507,7 +507,7 @@
    "referenced_type" : "_ZTIKN3art3dex8StringIdE",
    "self_type" : "_ZTIPKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -516,7 +516,7 @@
    "referenced_type" : "_ZTIKN3art7DexFileE",
    "self_type" : "_ZTIPKN3art7DexFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -525,7 +525,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -534,7 +534,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -543,7 +543,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -552,7 +552,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -561,7 +561,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -579,7 +579,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -588,7 +588,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -606,7 +606,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -615,7 +615,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -624,7 +624,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -633,7 +633,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -642,7 +642,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -651,7 +651,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -660,7 +660,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -669,7 +669,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -678,7 +678,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -687,7 +687,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -696,7 +696,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -705,7 +705,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -714,7 +714,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -723,7 +723,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -732,7 +732,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -741,7 +741,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -750,7 +750,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -759,7 +759,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -768,7 +768,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -777,7 +777,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -786,7 +786,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -795,7 +795,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -804,7 +804,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -813,7 +813,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIbbEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -822,7 +822,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -831,7 +831,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -840,7 +840,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -849,7 +849,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -858,7 +858,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -867,7 +867,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIPN7android4base19ScopedLockAssertionE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   },
   {
    "alignment" : 4,
@@ -894,7 +894,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -903,7 +903,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -912,7 +912,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -963,7 +963,7 @@
    "referenced_type" : "_ZTIN3art3dex6TypeIdE",
    "self_type" : "_ZTIKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -973,7 +973,7 @@
    "referenced_type" : "_ZTIN3art3dex7FieldIdE",
    "self_type" : "_ZTIKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -983,7 +983,7 @@
    "referenced_type" : "_ZTIN3art3dex7ProtoIdE",
    "self_type" : "_ZTIKN3art3dex7ProtoIdE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -993,7 +993,7 @@
    "referenced_type" : "_ZTIN3art3dex8ClassDefE",
    "self_type" : "_ZTIKN3art3dex8ClassDefE",
    "size" : 32,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1003,7 +1003,7 @@
    "referenced_type" : "_ZTIN3art3dex8MethodIdE",
    "self_type" : "_ZTIKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1013,7 +1013,7 @@
    "referenced_type" : "_ZTIN3art3dex8StringIdE",
    "self_type" : "_ZTIKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1023,7 +1023,7 @@
    "referenced_type" : "_ZTIN3art7DexFileE",
    "self_type" : "_ZTIKN3art7DexFileE",
    "size" : 96,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1033,7 +1033,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1043,7 +1043,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1053,7 +1053,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1063,7 +1063,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1073,7 +1073,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1083,7 +1083,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1093,7 +1093,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1113,7 +1113,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1123,7 +1123,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 2,
@@ -1133,7 +1133,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -1188,7 +1188,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1206,7 +1206,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1236,7 +1236,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1253,7 +1253,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -1262,7 +1262,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1280,7 +1280,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1301,7 +1301,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex6TypeIdE", "_ZTIPKN3art3dex6TypeIdE" ]
   },
   {
@@ -1323,7 +1323,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7FieldIdE", "_ZTIPKN3art3dex7FieldIdE" ]
   },
   {
@@ -1345,7 +1345,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7ProtoIdE", "_ZTIPKN3art3dex7ProtoIdE" ]
   },
   {
@@ -1367,7 +1367,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8ClassDefE", "_ZTIPKN3art3dex8ClassDefE" ]
   },
   {
@@ -1389,7 +1389,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8MethodIdE", "_ZTIPKN3art3dex8MethodIdE" ]
   },
   {
@@ -1411,7 +1411,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8StringIdE", "_ZTIPKN3art3dex8StringIdE" ]
   },
   {
@@ -1433,7 +1433,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art7DexFileE", "_ZTIPKN3art7DexFileE" ]
   },
   {
@@ -1455,7 +1455,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -1477,7 +1477,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -1499,7 +1499,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -1521,7 +1521,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -1543,7 +1543,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -1565,7 +1565,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -1587,7 +1587,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKt", "_ZTIPKt" ]
   },
   {
@@ -1609,7 +1609,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -1631,7 +1631,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -1653,7 +1653,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -1675,7 +1675,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -1697,7 +1697,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -1719,7 +1719,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -1741,7 +1741,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIb", "_ZTIb" ]
   },
   {
@@ -1763,7 +1763,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -1785,7 +1785,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIj" ]
   },
   {
@@ -1807,7 +1807,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIj" ]
   },
   {
@@ -1829,7 +1829,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIt" ]
   },
   {
@@ -1848,7 +1848,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -1867,7 +1867,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1877,7 +1877,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "rvalue_reference_types" :
@@ -1889,7 +1889,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   }
  ]
 }
diff --git a/30/64/arm_armv8-a/source-based/libdexfile_external.so.lsdump b/30/64/arm_armv8-a/source-based/libdexfile_external.so.lsdump
index 27cb135..061d911 100644
--- a/30/64/arm_armv8-a/source-based/libdexfile_external.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libdexfile_external.so.lsdump
@@ -163,7 +163,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -378,7 +378,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -387,7 +387,7 @@
    "referenced_type" : "_ZTINSt3__15mutexE",
    "self_type" : "_ZTIRNSt3__15mutexE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "pointer_types" :
@@ -417,7 +417,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -426,7 +426,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -462,7 +462,7 @@
    "referenced_type" : "_ZTIKN3art3dex6TypeIdE",
    "self_type" : "_ZTIPKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -471,7 +471,7 @@
    "referenced_type" : "_ZTIKN3art3dex7FieldIdE",
    "self_type" : "_ZTIPKN3art3dex7FieldIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -480,7 +480,7 @@
    "referenced_type" : "_ZTIKN3art3dex7ProtoIdE",
    "self_type" : "_ZTIPKN3art3dex7ProtoIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -489,7 +489,7 @@
    "referenced_type" : "_ZTIKN3art3dex8ClassDefE",
    "self_type" : "_ZTIPKN3art3dex8ClassDefE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -498,7 +498,7 @@
    "referenced_type" : "_ZTIKN3art3dex8MethodIdE",
    "self_type" : "_ZTIPKN3art3dex8MethodIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -507,7 +507,7 @@
    "referenced_type" : "_ZTIKN3art3dex8StringIdE",
    "self_type" : "_ZTIPKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -516,7 +516,7 @@
    "referenced_type" : "_ZTIKN3art7DexFileE",
    "self_type" : "_ZTIPKN3art7DexFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -525,7 +525,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -534,7 +534,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -543,7 +543,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -552,7 +552,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -561,7 +561,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -579,7 +579,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -588,7 +588,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -606,7 +606,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -615,7 +615,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -624,7 +624,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -633,7 +633,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -642,7 +642,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -651,7 +651,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -660,7 +660,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -669,7 +669,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -678,7 +678,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -687,7 +687,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -696,7 +696,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -705,7 +705,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -714,7 +714,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -723,7 +723,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -732,7 +732,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -741,7 +741,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -750,7 +750,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -759,7 +759,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -768,7 +768,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -777,7 +777,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -786,7 +786,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -795,7 +795,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -804,7 +804,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -813,7 +813,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIbbEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -822,7 +822,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -831,7 +831,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -840,7 +840,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -849,7 +849,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -858,7 +858,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -867,7 +867,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIPN7android4base19ScopedLockAssertionE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   },
   {
    "alignment" : 4,
@@ -894,7 +894,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -903,7 +903,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -912,7 +912,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -963,7 +963,7 @@
    "referenced_type" : "_ZTIN3art3dex6TypeIdE",
    "self_type" : "_ZTIKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -973,7 +973,7 @@
    "referenced_type" : "_ZTIN3art3dex7FieldIdE",
    "self_type" : "_ZTIKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -983,7 +983,7 @@
    "referenced_type" : "_ZTIN3art3dex7ProtoIdE",
    "self_type" : "_ZTIKN3art3dex7ProtoIdE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -993,7 +993,7 @@
    "referenced_type" : "_ZTIN3art3dex8ClassDefE",
    "self_type" : "_ZTIKN3art3dex8ClassDefE",
    "size" : 32,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1003,7 +1003,7 @@
    "referenced_type" : "_ZTIN3art3dex8MethodIdE",
    "self_type" : "_ZTIKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1013,7 +1013,7 @@
    "referenced_type" : "_ZTIN3art3dex8StringIdE",
    "self_type" : "_ZTIKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1023,7 +1023,7 @@
    "referenced_type" : "_ZTIN3art7DexFileE",
    "self_type" : "_ZTIKN3art7DexFileE",
    "size" : 96,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1033,7 +1033,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1043,7 +1043,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1053,7 +1053,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1063,7 +1063,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1073,7 +1073,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1083,7 +1083,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1093,7 +1093,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1113,7 +1113,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1123,7 +1123,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 2,
@@ -1133,7 +1133,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -1188,7 +1188,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1206,7 +1206,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1236,7 +1236,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1253,7 +1253,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -1262,7 +1262,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1280,7 +1280,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1301,7 +1301,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex6TypeIdE", "_ZTIPKN3art3dex6TypeIdE" ]
   },
   {
@@ -1323,7 +1323,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7FieldIdE", "_ZTIPKN3art3dex7FieldIdE" ]
   },
   {
@@ -1345,7 +1345,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7ProtoIdE", "_ZTIPKN3art3dex7ProtoIdE" ]
   },
   {
@@ -1367,7 +1367,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8ClassDefE", "_ZTIPKN3art3dex8ClassDefE" ]
   },
   {
@@ -1389,7 +1389,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8MethodIdE", "_ZTIPKN3art3dex8MethodIdE" ]
   },
   {
@@ -1411,7 +1411,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8StringIdE", "_ZTIPKN3art3dex8StringIdE" ]
   },
   {
@@ -1433,7 +1433,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art7DexFileE", "_ZTIPKN3art7DexFileE" ]
   },
   {
@@ -1455,7 +1455,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -1477,7 +1477,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -1499,7 +1499,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -1521,7 +1521,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -1543,7 +1543,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -1565,7 +1565,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -1587,7 +1587,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKt", "_ZTIPKt" ]
   },
   {
@@ -1609,7 +1609,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -1631,7 +1631,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -1653,7 +1653,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -1675,7 +1675,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -1697,7 +1697,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -1719,7 +1719,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -1741,7 +1741,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIb", "_ZTIb" ]
   },
   {
@@ -1763,7 +1763,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -1785,7 +1785,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIj" ]
   },
   {
@@ -1807,7 +1807,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIj" ]
   },
   {
@@ -1829,7 +1829,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIt" ]
   },
   {
@@ -1848,7 +1848,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -1867,7 +1867,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1877,7 +1877,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "rvalue_reference_types" :
@@ -1889,7 +1889,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   }
  ]
 }
diff --git a/30/64/arm_armv8-a/source-based/libdexfiled_external.so.lsdump b/30/64/arm_armv8-a/source-based/libdexfiled_external.so.lsdump
index 27cb135..061d911 100644
--- a/30/64/arm_armv8-a/source-based/libdexfiled_external.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libdexfiled_external.so.lsdump
@@ -163,7 +163,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -378,7 +378,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -387,7 +387,7 @@
    "referenced_type" : "_ZTINSt3__15mutexE",
    "self_type" : "_ZTIRNSt3__15mutexE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "pointer_types" :
@@ -417,7 +417,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -426,7 +426,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -462,7 +462,7 @@
    "referenced_type" : "_ZTIKN3art3dex6TypeIdE",
    "self_type" : "_ZTIPKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -471,7 +471,7 @@
    "referenced_type" : "_ZTIKN3art3dex7FieldIdE",
    "self_type" : "_ZTIPKN3art3dex7FieldIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -480,7 +480,7 @@
    "referenced_type" : "_ZTIKN3art3dex7ProtoIdE",
    "self_type" : "_ZTIPKN3art3dex7ProtoIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -489,7 +489,7 @@
    "referenced_type" : "_ZTIKN3art3dex8ClassDefE",
    "self_type" : "_ZTIPKN3art3dex8ClassDefE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -498,7 +498,7 @@
    "referenced_type" : "_ZTIKN3art3dex8MethodIdE",
    "self_type" : "_ZTIPKN3art3dex8MethodIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -507,7 +507,7 @@
    "referenced_type" : "_ZTIKN3art3dex8StringIdE",
    "self_type" : "_ZTIPKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -516,7 +516,7 @@
    "referenced_type" : "_ZTIKN3art7DexFileE",
    "self_type" : "_ZTIPKN3art7DexFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -525,7 +525,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -534,7 +534,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -543,7 +543,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -552,7 +552,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -561,7 +561,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -579,7 +579,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -588,7 +588,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -606,7 +606,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -615,7 +615,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -624,7 +624,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -633,7 +633,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -642,7 +642,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -651,7 +651,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -660,7 +660,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -669,7 +669,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -678,7 +678,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -687,7 +687,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -696,7 +696,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -705,7 +705,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -714,7 +714,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -723,7 +723,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -732,7 +732,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -741,7 +741,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -750,7 +750,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -759,7 +759,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -768,7 +768,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -777,7 +777,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -786,7 +786,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -795,7 +795,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -804,7 +804,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -813,7 +813,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIbbEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -822,7 +822,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -831,7 +831,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -840,7 +840,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -849,7 +849,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -858,7 +858,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -867,7 +867,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIPN7android4base19ScopedLockAssertionE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   },
   {
    "alignment" : 4,
@@ -894,7 +894,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -903,7 +903,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -912,7 +912,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -963,7 +963,7 @@
    "referenced_type" : "_ZTIN3art3dex6TypeIdE",
    "self_type" : "_ZTIKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -973,7 +973,7 @@
    "referenced_type" : "_ZTIN3art3dex7FieldIdE",
    "self_type" : "_ZTIKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -983,7 +983,7 @@
    "referenced_type" : "_ZTIN3art3dex7ProtoIdE",
    "self_type" : "_ZTIKN3art3dex7ProtoIdE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -993,7 +993,7 @@
    "referenced_type" : "_ZTIN3art3dex8ClassDefE",
    "self_type" : "_ZTIKN3art3dex8ClassDefE",
    "size" : 32,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1003,7 +1003,7 @@
    "referenced_type" : "_ZTIN3art3dex8MethodIdE",
    "self_type" : "_ZTIKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1013,7 +1013,7 @@
    "referenced_type" : "_ZTIN3art3dex8StringIdE",
    "self_type" : "_ZTIKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1023,7 +1023,7 @@
    "referenced_type" : "_ZTIN3art7DexFileE",
    "self_type" : "_ZTIKN3art7DexFileE",
    "size" : 96,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1033,7 +1033,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1043,7 +1043,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1053,7 +1053,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1063,7 +1063,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1073,7 +1073,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1083,7 +1083,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1093,7 +1093,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1113,7 +1113,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1123,7 +1123,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 2,
@@ -1133,7 +1133,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -1188,7 +1188,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1206,7 +1206,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1236,7 +1236,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1253,7 +1253,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -1262,7 +1262,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1280,7 +1280,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1301,7 +1301,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex6TypeIdE", "_ZTIPKN3art3dex6TypeIdE" ]
   },
   {
@@ -1323,7 +1323,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7FieldIdE", "_ZTIPKN3art3dex7FieldIdE" ]
   },
   {
@@ -1345,7 +1345,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7ProtoIdE", "_ZTIPKN3art3dex7ProtoIdE" ]
   },
   {
@@ -1367,7 +1367,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8ClassDefE", "_ZTIPKN3art3dex8ClassDefE" ]
   },
   {
@@ -1389,7 +1389,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8MethodIdE", "_ZTIPKN3art3dex8MethodIdE" ]
   },
   {
@@ -1411,7 +1411,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8StringIdE", "_ZTIPKN3art3dex8StringIdE" ]
   },
   {
@@ -1433,7 +1433,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art7DexFileE", "_ZTIPKN3art7DexFileE" ]
   },
   {
@@ -1455,7 +1455,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -1477,7 +1477,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -1499,7 +1499,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -1521,7 +1521,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -1543,7 +1543,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -1565,7 +1565,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -1587,7 +1587,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKt", "_ZTIPKt" ]
   },
   {
@@ -1609,7 +1609,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -1631,7 +1631,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -1653,7 +1653,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -1675,7 +1675,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -1697,7 +1697,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -1719,7 +1719,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -1741,7 +1741,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIb", "_ZTIb" ]
   },
   {
@@ -1763,7 +1763,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -1785,7 +1785,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIj" ]
   },
   {
@@ -1807,7 +1807,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIj" ]
   },
   {
@@ -1829,7 +1829,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIt" ]
   },
   {
@@ -1848,7 +1848,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -1867,7 +1867,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1877,7 +1877,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "rvalue_reference_types" :
@@ -1889,7 +1889,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   }
  ]
 }
diff --git a/30/64/x86/source-based/libdexfile_external.so.lsdump b/30/64/x86/source-based/libdexfile_external.so.lsdump
index a687330..e73bcbe 100644
--- a/30/64/x86/source-based/libdexfile_external.so.lsdump
+++ b/30/64/x86/source-based/libdexfile_external.so.lsdump
@@ -162,7 +162,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -195,7 +195,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -377,7 +377,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -386,7 +386,7 @@
    "referenced_type" : "_ZTINSt3__15mutexE",
    "self_type" : "_ZTIRNSt3__15mutexE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "pointer_types" :
@@ -416,7 +416,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -425,7 +425,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -461,7 +461,7 @@
    "referenced_type" : "_ZTIKN3art3dex6TypeIdE",
    "self_type" : "_ZTIPKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -470,7 +470,7 @@
    "referenced_type" : "_ZTIKN3art3dex7FieldIdE",
    "self_type" : "_ZTIPKN3art3dex7FieldIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -479,7 +479,7 @@
    "referenced_type" : "_ZTIKN3art3dex7ProtoIdE",
    "self_type" : "_ZTIPKN3art3dex7ProtoIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -488,7 +488,7 @@
    "referenced_type" : "_ZTIKN3art3dex8ClassDefE",
    "self_type" : "_ZTIPKN3art3dex8ClassDefE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -497,7 +497,7 @@
    "referenced_type" : "_ZTIKN3art3dex8MethodIdE",
    "self_type" : "_ZTIPKN3art3dex8MethodIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -506,7 +506,7 @@
    "referenced_type" : "_ZTIKN3art3dex8StringIdE",
    "self_type" : "_ZTIPKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -515,7 +515,7 @@
    "referenced_type" : "_ZTIKN3art7DexFileE",
    "self_type" : "_ZTIPKN3art7DexFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -524,7 +524,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -533,7 +533,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -542,7 +542,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -551,7 +551,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -560,7 +560,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -578,7 +578,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -587,7 +587,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -605,7 +605,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -614,7 +614,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -623,7 +623,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -632,7 +632,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -641,7 +641,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -650,7 +650,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -659,7 +659,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -668,7 +668,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -677,7 +677,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -686,7 +686,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -695,7 +695,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -704,7 +704,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -713,7 +713,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -722,7 +722,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -731,7 +731,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -740,7 +740,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -749,7 +749,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -758,7 +758,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -767,7 +767,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -776,7 +776,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -785,7 +785,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -794,7 +794,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -803,7 +803,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -812,7 +812,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIbbEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -821,7 +821,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -830,7 +830,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -839,7 +839,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -848,7 +848,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -857,7 +857,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -866,7 +866,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIPN7android4base19ScopedLockAssertionE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   },
   {
    "alignment" : 4,
@@ -893,7 +893,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -902,7 +902,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -911,7 +911,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -962,7 +962,7 @@
    "referenced_type" : "_ZTIN3art3dex6TypeIdE",
    "self_type" : "_ZTIKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -972,7 +972,7 @@
    "referenced_type" : "_ZTIN3art3dex7FieldIdE",
    "self_type" : "_ZTIKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -982,7 +982,7 @@
    "referenced_type" : "_ZTIN3art3dex7ProtoIdE",
    "self_type" : "_ZTIKN3art3dex7ProtoIdE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -992,7 +992,7 @@
    "referenced_type" : "_ZTIN3art3dex8ClassDefE",
    "self_type" : "_ZTIKN3art3dex8ClassDefE",
    "size" : 32,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1002,7 +1002,7 @@
    "referenced_type" : "_ZTIN3art3dex8MethodIdE",
    "self_type" : "_ZTIKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1012,7 +1012,7 @@
    "referenced_type" : "_ZTIN3art3dex8StringIdE",
    "self_type" : "_ZTIKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1022,7 +1022,7 @@
    "referenced_type" : "_ZTIN3art7DexFileE",
    "self_type" : "_ZTIKN3art7DexFileE",
    "size" : 96,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1032,7 +1032,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1042,7 +1042,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1052,7 +1052,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1062,7 +1062,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1072,7 +1072,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1082,7 +1082,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1092,7 +1092,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1112,7 +1112,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1122,7 +1122,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 2,
@@ -1132,7 +1132,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -1187,7 +1187,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1205,7 +1205,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1235,7 +1235,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1252,7 +1252,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -1261,7 +1261,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1279,7 +1279,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1300,7 +1300,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex6TypeIdE", "_ZTIPKN3art3dex6TypeIdE" ]
   },
   {
@@ -1322,7 +1322,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7FieldIdE", "_ZTIPKN3art3dex7FieldIdE" ]
   },
   {
@@ -1344,7 +1344,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7ProtoIdE", "_ZTIPKN3art3dex7ProtoIdE" ]
   },
   {
@@ -1366,7 +1366,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8ClassDefE", "_ZTIPKN3art3dex8ClassDefE" ]
   },
   {
@@ -1388,7 +1388,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8MethodIdE", "_ZTIPKN3art3dex8MethodIdE" ]
   },
   {
@@ -1410,7 +1410,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8StringIdE", "_ZTIPKN3art3dex8StringIdE" ]
   },
   {
@@ -1432,7 +1432,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art7DexFileE", "_ZTIPKN3art7DexFileE" ]
   },
   {
@@ -1454,7 +1454,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -1476,7 +1476,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -1498,7 +1498,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -1520,7 +1520,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -1542,7 +1542,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -1564,7 +1564,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -1586,7 +1586,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKt", "_ZTIPKt" ]
   },
   {
@@ -1608,7 +1608,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -1630,7 +1630,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -1652,7 +1652,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -1674,7 +1674,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -1696,7 +1696,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -1718,7 +1718,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -1740,7 +1740,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIb", "_ZTIb" ]
   },
   {
@@ -1762,7 +1762,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -1784,7 +1784,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIj" ]
   },
   {
@@ -1806,7 +1806,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIj" ]
   },
   {
@@ -1828,7 +1828,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIt" ]
   },
   {
@@ -1847,7 +1847,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -1866,7 +1866,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1876,7 +1876,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "rvalue_reference_types" :
@@ -1888,7 +1888,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   }
  ]
 }
diff --git a/30/64/x86/source-based/libdexfiled_external.so.lsdump b/30/64/x86/source-based/libdexfiled_external.so.lsdump
index a687330..e73bcbe 100644
--- a/30/64/x86/source-based/libdexfiled_external.so.lsdump
+++ b/30/64/x86/source-based/libdexfiled_external.so.lsdump
@@ -162,7 +162,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -195,7 +195,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -377,7 +377,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -386,7 +386,7 @@
    "referenced_type" : "_ZTINSt3__15mutexE",
    "self_type" : "_ZTIRNSt3__15mutexE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "pointer_types" :
@@ -416,7 +416,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -425,7 +425,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -461,7 +461,7 @@
    "referenced_type" : "_ZTIKN3art3dex6TypeIdE",
    "self_type" : "_ZTIPKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -470,7 +470,7 @@
    "referenced_type" : "_ZTIKN3art3dex7FieldIdE",
    "self_type" : "_ZTIPKN3art3dex7FieldIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -479,7 +479,7 @@
    "referenced_type" : "_ZTIKN3art3dex7ProtoIdE",
    "self_type" : "_ZTIPKN3art3dex7ProtoIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -488,7 +488,7 @@
    "referenced_type" : "_ZTIKN3art3dex8ClassDefE",
    "self_type" : "_ZTIPKN3art3dex8ClassDefE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -497,7 +497,7 @@
    "referenced_type" : "_ZTIKN3art3dex8MethodIdE",
    "self_type" : "_ZTIPKN3art3dex8MethodIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -506,7 +506,7 @@
    "referenced_type" : "_ZTIKN3art3dex8StringIdE",
    "self_type" : "_ZTIPKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -515,7 +515,7 @@
    "referenced_type" : "_ZTIKN3art7DexFileE",
    "self_type" : "_ZTIPKN3art7DexFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -524,7 +524,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -533,7 +533,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -542,7 +542,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -551,7 +551,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -560,7 +560,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -578,7 +578,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -587,7 +587,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -605,7 +605,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -614,7 +614,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -623,7 +623,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -632,7 +632,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -641,7 +641,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -650,7 +650,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -659,7 +659,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -668,7 +668,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -677,7 +677,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -686,7 +686,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -695,7 +695,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -704,7 +704,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -713,7 +713,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -722,7 +722,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -731,7 +731,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -740,7 +740,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -749,7 +749,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -758,7 +758,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -767,7 +767,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -776,7 +776,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -785,7 +785,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -794,7 +794,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -803,7 +803,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -812,7 +812,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIbbEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -821,7 +821,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -830,7 +830,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -839,7 +839,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -848,7 +848,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -857,7 +857,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -866,7 +866,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIPN7android4base19ScopedLockAssertionE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   },
   {
    "alignment" : 4,
@@ -893,7 +893,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -902,7 +902,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -911,7 +911,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -962,7 +962,7 @@
    "referenced_type" : "_ZTIN3art3dex6TypeIdE",
    "self_type" : "_ZTIKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -972,7 +972,7 @@
    "referenced_type" : "_ZTIN3art3dex7FieldIdE",
    "self_type" : "_ZTIKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -982,7 +982,7 @@
    "referenced_type" : "_ZTIN3art3dex7ProtoIdE",
    "self_type" : "_ZTIKN3art3dex7ProtoIdE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -992,7 +992,7 @@
    "referenced_type" : "_ZTIN3art3dex8ClassDefE",
    "self_type" : "_ZTIKN3art3dex8ClassDefE",
    "size" : 32,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1002,7 +1002,7 @@
    "referenced_type" : "_ZTIN3art3dex8MethodIdE",
    "self_type" : "_ZTIKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1012,7 +1012,7 @@
    "referenced_type" : "_ZTIN3art3dex8StringIdE",
    "self_type" : "_ZTIKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1022,7 +1022,7 @@
    "referenced_type" : "_ZTIN3art7DexFileE",
    "self_type" : "_ZTIKN3art7DexFileE",
    "size" : 96,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1032,7 +1032,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1042,7 +1042,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1052,7 +1052,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1062,7 +1062,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1072,7 +1072,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1082,7 +1082,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1092,7 +1092,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1112,7 +1112,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1122,7 +1122,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 2,
@@ -1132,7 +1132,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -1187,7 +1187,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1205,7 +1205,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1235,7 +1235,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1252,7 +1252,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -1261,7 +1261,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1279,7 +1279,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1300,7 +1300,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex6TypeIdE", "_ZTIPKN3art3dex6TypeIdE" ]
   },
   {
@@ -1322,7 +1322,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7FieldIdE", "_ZTIPKN3art3dex7FieldIdE" ]
   },
   {
@@ -1344,7 +1344,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7ProtoIdE", "_ZTIPKN3art3dex7ProtoIdE" ]
   },
   {
@@ -1366,7 +1366,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8ClassDefE", "_ZTIPKN3art3dex8ClassDefE" ]
   },
   {
@@ -1388,7 +1388,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8MethodIdE", "_ZTIPKN3art3dex8MethodIdE" ]
   },
   {
@@ -1410,7 +1410,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8StringIdE", "_ZTIPKN3art3dex8StringIdE" ]
   },
   {
@@ -1432,7 +1432,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art7DexFileE", "_ZTIPKN3art7DexFileE" ]
   },
   {
@@ -1454,7 +1454,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -1476,7 +1476,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -1498,7 +1498,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -1520,7 +1520,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -1542,7 +1542,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -1564,7 +1564,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -1586,7 +1586,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKt", "_ZTIPKt" ]
   },
   {
@@ -1608,7 +1608,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -1630,7 +1630,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -1652,7 +1652,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -1674,7 +1674,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -1696,7 +1696,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -1718,7 +1718,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -1740,7 +1740,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIb", "_ZTIb" ]
   },
   {
@@ -1762,7 +1762,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -1784,7 +1784,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIj" ]
   },
   {
@@ -1806,7 +1806,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIj" ]
   },
   {
@@ -1828,7 +1828,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIt" ]
   },
   {
@@ -1847,7 +1847,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -1866,7 +1866,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1876,7 +1876,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "rvalue_reference_types" :
@@ -1888,7 +1888,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   }
  ]
 }
diff --git a/30/64/x86_64/source-based/libdexfile_external.so.lsdump b/30/64/x86_64/source-based/libdexfile_external.so.lsdump
index 78a34ca..acfde81 100644
--- a/30/64/x86_64/source-based/libdexfile_external.so.lsdump
+++ b/30/64/x86_64/source-based/libdexfile_external.so.lsdump
@@ -163,7 +163,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -378,7 +378,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -387,7 +387,7 @@
    "referenced_type" : "_ZTINSt3__15mutexE",
    "self_type" : "_ZTIRNSt3__15mutexE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "pointer_types" :
@@ -417,7 +417,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -426,7 +426,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -462,7 +462,7 @@
    "referenced_type" : "_ZTIKN3art3dex6TypeIdE",
    "self_type" : "_ZTIPKN3art3dex6TypeIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -471,7 +471,7 @@
    "referenced_type" : "_ZTIKN3art3dex7FieldIdE",
    "self_type" : "_ZTIPKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -480,7 +480,7 @@
    "referenced_type" : "_ZTIKN3art3dex7ProtoIdE",
    "self_type" : "_ZTIPKN3art3dex7ProtoIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -489,7 +489,7 @@
    "referenced_type" : "_ZTIKN3art3dex8ClassDefE",
    "self_type" : "_ZTIPKN3art3dex8ClassDefE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -498,7 +498,7 @@
    "referenced_type" : "_ZTIKN3art3dex8MethodIdE",
    "self_type" : "_ZTIPKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -507,7 +507,7 @@
    "referenced_type" : "_ZTIKN3art3dex8StringIdE",
    "self_type" : "_ZTIPKN3art3dex8StringIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -516,7 +516,7 @@
    "referenced_type" : "_ZTIKN3art7DexFileE",
    "self_type" : "_ZTIPKN3art7DexFileE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -525,7 +525,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -534,7 +534,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -543,7 +543,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -552,7 +552,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -561,7 +561,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -579,7 +579,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -588,7 +588,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -606,7 +606,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -615,7 +615,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -624,7 +624,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -633,7 +633,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -642,7 +642,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -651,7 +651,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -660,7 +660,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -669,7 +669,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -678,7 +678,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -687,7 +687,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -696,7 +696,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -705,7 +705,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -714,7 +714,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -723,7 +723,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -732,7 +732,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -741,7 +741,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -750,7 +750,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -759,7 +759,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -768,7 +768,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -777,7 +777,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -786,7 +786,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -795,7 +795,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -804,7 +804,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -813,7 +813,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIbbEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -822,7 +822,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -831,7 +831,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjmEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjmEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -840,7 +840,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIliEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIliEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -849,7 +849,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorImjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorImjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -858,7 +858,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorImmEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorImmEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -867,7 +867,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -876,7 +876,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItmEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItmEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -885,7 +885,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIttEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -894,7 +894,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -903,7 +903,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIPN7android4base19ScopedLockAssertionE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   },
   {
    "alignment" : 8,
@@ -930,7 +930,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -939,7 +939,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -948,7 +948,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -999,7 +999,7 @@
    "referenced_type" : "_ZTIN3art3dex6TypeIdE",
    "self_type" : "_ZTIKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1009,7 +1009,7 @@
    "referenced_type" : "_ZTIN3art3dex7FieldIdE",
    "self_type" : "_ZTIKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1019,7 +1019,7 @@
    "referenced_type" : "_ZTIN3art3dex7ProtoIdE",
    "self_type" : "_ZTIKN3art3dex7ProtoIdE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1029,7 +1029,7 @@
    "referenced_type" : "_ZTIN3art3dex8ClassDefE",
    "self_type" : "_ZTIKN3art3dex8ClassDefE",
    "size" : 32,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1039,7 +1039,7 @@
    "referenced_type" : "_ZTIN3art3dex8MethodIdE",
    "self_type" : "_ZTIKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1049,7 +1049,7 @@
    "referenced_type" : "_ZTIN3art3dex8StringIdE",
    "self_type" : "_ZTIKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1059,7 +1059,7 @@
    "referenced_type" : "_ZTIN3art7DexFileE",
    "self_type" : "_ZTIKN3art7DexFileE",
    "size" : 192,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1069,7 +1069,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 24,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1079,7 +1079,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1089,7 +1089,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -1099,7 +1099,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1109,7 +1109,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 24,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1119,7 +1119,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1129,7 +1129,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1149,7 +1149,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1159,7 +1159,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 2,
@@ -1169,7 +1169,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -1224,7 +1224,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1242,7 +1242,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1272,7 +1272,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 24,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1289,7 +1289,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -1298,7 +1298,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1316,7 +1316,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -1337,7 +1337,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex6TypeIdE", "_ZTIPKN3art3dex6TypeIdE" ]
   },
   {
@@ -1359,7 +1359,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7FieldIdE", "_ZTIPKN3art3dex7FieldIdE" ]
   },
   {
@@ -1381,7 +1381,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7ProtoIdE", "_ZTIPKN3art3dex7ProtoIdE" ]
   },
   {
@@ -1403,7 +1403,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8ClassDefE", "_ZTIPKN3art3dex8ClassDefE" ]
   },
   {
@@ -1425,7 +1425,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8MethodIdE", "_ZTIPKN3art3dex8MethodIdE" ]
   },
   {
@@ -1447,7 +1447,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8StringIdE", "_ZTIPKN3art3dex8StringIdE" ]
   },
   {
@@ -1469,7 +1469,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art7DexFileE", "_ZTIPKN3art7DexFileE" ]
   },
   {
@@ -1491,7 +1491,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -1513,7 +1513,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -1535,7 +1535,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -1557,7 +1557,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -1579,7 +1579,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -1601,7 +1601,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -1623,7 +1623,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKt", "_ZTIPKt" ]
   },
   {
@@ -1645,7 +1645,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -1667,7 +1667,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -1689,7 +1689,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -1711,7 +1711,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -1733,7 +1733,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -1755,7 +1755,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -1777,7 +1777,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIb", "_ZTIb" ]
   },
   {
@@ -1799,7 +1799,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIj" ]
   },
   {
@@ -1821,7 +1821,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjmEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjmEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIm" ]
   },
   {
@@ -1843,7 +1843,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIliEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIliEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIl", "_ZTIi" ]
   },
   {
@@ -1865,7 +1865,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorImjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorImjEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIm", "_ZTIj" ]
   },
   {
@@ -1887,7 +1887,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorImmEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorImmEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIm", "_ZTIm" ]
   },
   {
@@ -1909,7 +1909,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIj" ]
   },
   {
@@ -1931,7 +1931,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItmEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItmEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIm" ]
   },
   {
@@ -1953,7 +1953,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIt" ]
   },
   {
@@ -1972,7 +1972,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -1991,7 +1991,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -2001,7 +2001,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "rvalue_reference_types" :
@@ -2013,7 +2013,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   }
  ]
 }
diff --git a/30/64/x86_64/source-based/libdexfiled_external.so.lsdump b/30/64/x86_64/source-based/libdexfiled_external.so.lsdump
index 78a34ca..acfde81 100644
--- a/30/64/x86_64/source-based/libdexfiled_external.so.lsdump
+++ b/30/64/x86_64/source-based/libdexfiled_external.so.lsdump
@@ -163,7 +163,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -378,7 +378,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -387,7 +387,7 @@
    "referenced_type" : "_ZTINSt3__15mutexE",
    "self_type" : "_ZTIRNSt3__15mutexE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "pointer_types" :
@@ -417,7 +417,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -426,7 +426,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -462,7 +462,7 @@
    "referenced_type" : "_ZTIKN3art3dex6TypeIdE",
    "self_type" : "_ZTIPKN3art3dex6TypeIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -471,7 +471,7 @@
    "referenced_type" : "_ZTIKN3art3dex7FieldIdE",
    "self_type" : "_ZTIPKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -480,7 +480,7 @@
    "referenced_type" : "_ZTIKN3art3dex7ProtoIdE",
    "self_type" : "_ZTIPKN3art3dex7ProtoIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -489,7 +489,7 @@
    "referenced_type" : "_ZTIKN3art3dex8ClassDefE",
    "self_type" : "_ZTIPKN3art3dex8ClassDefE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -498,7 +498,7 @@
    "referenced_type" : "_ZTIKN3art3dex8MethodIdE",
    "self_type" : "_ZTIPKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -507,7 +507,7 @@
    "referenced_type" : "_ZTIKN3art3dex8StringIdE",
    "self_type" : "_ZTIPKN3art3dex8StringIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -516,7 +516,7 @@
    "referenced_type" : "_ZTIKN3art7DexFileE",
    "self_type" : "_ZTIPKN3art7DexFileE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -525,7 +525,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -534,7 +534,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -543,7 +543,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -552,7 +552,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -561,7 +561,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -579,7 +579,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -588,7 +588,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -606,7 +606,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -615,7 +615,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -624,7 +624,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -633,7 +633,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -642,7 +642,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -651,7 +651,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -660,7 +660,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -669,7 +669,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -678,7 +678,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -687,7 +687,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -696,7 +696,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -705,7 +705,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -714,7 +714,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -723,7 +723,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -732,7 +732,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -741,7 +741,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -750,7 +750,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -759,7 +759,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -768,7 +768,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -777,7 +777,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -786,7 +786,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -795,7 +795,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -804,7 +804,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -813,7 +813,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIbbEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -822,7 +822,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -831,7 +831,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjmEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjmEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -840,7 +840,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIliEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIliEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -849,7 +849,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorImjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorImjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -858,7 +858,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorImmEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorImmEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -867,7 +867,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -876,7 +876,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItmEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItmEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -885,7 +885,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIttEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -894,7 +894,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -903,7 +903,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIPN7android4base19ScopedLockAssertionE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   },
   {
    "alignment" : 8,
@@ -930,7 +930,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -939,7 +939,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -948,7 +948,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -999,7 +999,7 @@
    "referenced_type" : "_ZTIN3art3dex6TypeIdE",
    "self_type" : "_ZTIKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1009,7 +1009,7 @@
    "referenced_type" : "_ZTIN3art3dex7FieldIdE",
    "self_type" : "_ZTIKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1019,7 +1019,7 @@
    "referenced_type" : "_ZTIN3art3dex7ProtoIdE",
    "self_type" : "_ZTIKN3art3dex7ProtoIdE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1029,7 +1029,7 @@
    "referenced_type" : "_ZTIN3art3dex8ClassDefE",
    "self_type" : "_ZTIKN3art3dex8ClassDefE",
    "size" : 32,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1039,7 +1039,7 @@
    "referenced_type" : "_ZTIN3art3dex8MethodIdE",
    "self_type" : "_ZTIKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1049,7 +1049,7 @@
    "referenced_type" : "_ZTIN3art3dex8StringIdE",
    "self_type" : "_ZTIKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1059,7 +1059,7 @@
    "referenced_type" : "_ZTIN3art7DexFileE",
    "self_type" : "_ZTIKN3art7DexFileE",
    "size" : 192,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1069,7 +1069,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 24,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1079,7 +1079,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1089,7 +1089,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -1099,7 +1099,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1109,7 +1109,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 24,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1119,7 +1119,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1129,7 +1129,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1149,7 +1149,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1159,7 +1159,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 2,
@@ -1169,7 +1169,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -1224,7 +1224,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1242,7 +1242,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -1272,7 +1272,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 24,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1289,7 +1289,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -1298,7 +1298,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1316,7 +1316,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -1337,7 +1337,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex6TypeIdE", "_ZTIPKN3art3dex6TypeIdE" ]
   },
   {
@@ -1359,7 +1359,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7FieldIdE", "_ZTIPKN3art3dex7FieldIdE" ]
   },
   {
@@ -1381,7 +1381,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7ProtoIdE", "_ZTIPKN3art3dex7ProtoIdE" ]
   },
   {
@@ -1403,7 +1403,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8ClassDefE", "_ZTIPKN3art3dex8ClassDefE" ]
   },
   {
@@ -1425,7 +1425,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8MethodIdE", "_ZTIPKN3art3dex8MethodIdE" ]
   },
   {
@@ -1447,7 +1447,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8StringIdE", "_ZTIPKN3art3dex8StringIdE" ]
   },
   {
@@ -1469,7 +1469,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art7DexFileE", "_ZTIPKN3art7DexFileE" ]
   },
   {
@@ -1491,7 +1491,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -1513,7 +1513,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -1535,7 +1535,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -1557,7 +1557,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -1579,7 +1579,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -1601,7 +1601,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -1623,7 +1623,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKt", "_ZTIPKt" ]
   },
   {
@@ -1645,7 +1645,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -1667,7 +1667,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -1689,7 +1689,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -1711,7 +1711,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -1733,7 +1733,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -1755,7 +1755,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -1777,7 +1777,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIb", "_ZTIb" ]
   },
   {
@@ -1799,7 +1799,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIj" ]
   },
   {
@@ -1821,7 +1821,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjmEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjmEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIm" ]
   },
   {
@@ -1843,7 +1843,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIliEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIliEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIl", "_ZTIi" ]
   },
   {
@@ -1865,7 +1865,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorImjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorImjEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIm", "_ZTIj" ]
   },
   {
@@ -1887,7 +1887,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorImmEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorImmEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIm", "_ZTIm" ]
   },
   {
@@ -1909,7 +1909,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIj" ]
   },
   {
@@ -1931,7 +1931,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItmEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItmEE",
    "size" : 16,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIm" ]
   },
   {
@@ -1953,7 +1953,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIt" ]
   },
   {
@@ -1972,7 +1972,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -1991,7 +1991,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -2001,7 +2001,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "rvalue_reference_types" :
@@ -2013,7 +2013,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   }
  ]
 }
diff --git a/30/64/x86_x86_64/source-based/libdexfile_external.so.lsdump b/30/64/x86_x86_64/source-based/libdexfile_external.so.lsdump
index a687330..e73bcbe 100644
--- a/30/64/x86_x86_64/source-based/libdexfile_external.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libdexfile_external.so.lsdump
@@ -162,7 +162,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -195,7 +195,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -377,7 +377,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -386,7 +386,7 @@
    "referenced_type" : "_ZTINSt3__15mutexE",
    "self_type" : "_ZTIRNSt3__15mutexE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "pointer_types" :
@@ -416,7 +416,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -425,7 +425,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -461,7 +461,7 @@
    "referenced_type" : "_ZTIKN3art3dex6TypeIdE",
    "self_type" : "_ZTIPKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -470,7 +470,7 @@
    "referenced_type" : "_ZTIKN3art3dex7FieldIdE",
    "self_type" : "_ZTIPKN3art3dex7FieldIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -479,7 +479,7 @@
    "referenced_type" : "_ZTIKN3art3dex7ProtoIdE",
    "self_type" : "_ZTIPKN3art3dex7ProtoIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -488,7 +488,7 @@
    "referenced_type" : "_ZTIKN3art3dex8ClassDefE",
    "self_type" : "_ZTIPKN3art3dex8ClassDefE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -497,7 +497,7 @@
    "referenced_type" : "_ZTIKN3art3dex8MethodIdE",
    "self_type" : "_ZTIPKN3art3dex8MethodIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -506,7 +506,7 @@
    "referenced_type" : "_ZTIKN3art3dex8StringIdE",
    "self_type" : "_ZTIPKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -515,7 +515,7 @@
    "referenced_type" : "_ZTIKN3art7DexFileE",
    "self_type" : "_ZTIPKN3art7DexFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -524,7 +524,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -533,7 +533,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -542,7 +542,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -551,7 +551,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -560,7 +560,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -578,7 +578,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -587,7 +587,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -605,7 +605,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -614,7 +614,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -623,7 +623,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -632,7 +632,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -641,7 +641,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -650,7 +650,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -659,7 +659,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -668,7 +668,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -677,7 +677,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -686,7 +686,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -695,7 +695,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -704,7 +704,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -713,7 +713,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -722,7 +722,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -731,7 +731,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -740,7 +740,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -749,7 +749,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -758,7 +758,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -767,7 +767,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -776,7 +776,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -785,7 +785,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -794,7 +794,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -803,7 +803,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -812,7 +812,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIbbEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -821,7 +821,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -830,7 +830,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -839,7 +839,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -848,7 +848,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -857,7 +857,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -866,7 +866,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIPN7android4base19ScopedLockAssertionE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   },
   {
    "alignment" : 4,
@@ -893,7 +893,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -902,7 +902,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -911,7 +911,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -962,7 +962,7 @@
    "referenced_type" : "_ZTIN3art3dex6TypeIdE",
    "self_type" : "_ZTIKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -972,7 +972,7 @@
    "referenced_type" : "_ZTIN3art3dex7FieldIdE",
    "self_type" : "_ZTIKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -982,7 +982,7 @@
    "referenced_type" : "_ZTIN3art3dex7ProtoIdE",
    "self_type" : "_ZTIKN3art3dex7ProtoIdE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -992,7 +992,7 @@
    "referenced_type" : "_ZTIN3art3dex8ClassDefE",
    "self_type" : "_ZTIKN3art3dex8ClassDefE",
    "size" : 32,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1002,7 +1002,7 @@
    "referenced_type" : "_ZTIN3art3dex8MethodIdE",
    "self_type" : "_ZTIKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1012,7 +1012,7 @@
    "referenced_type" : "_ZTIN3art3dex8StringIdE",
    "self_type" : "_ZTIKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1022,7 +1022,7 @@
    "referenced_type" : "_ZTIN3art7DexFileE",
    "self_type" : "_ZTIKN3art7DexFileE",
    "size" : 96,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1032,7 +1032,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1042,7 +1042,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1052,7 +1052,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1062,7 +1062,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1072,7 +1072,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1082,7 +1082,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1092,7 +1092,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1112,7 +1112,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1122,7 +1122,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 2,
@@ -1132,7 +1132,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -1187,7 +1187,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1205,7 +1205,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1235,7 +1235,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1252,7 +1252,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -1261,7 +1261,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1279,7 +1279,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1300,7 +1300,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex6TypeIdE", "_ZTIPKN3art3dex6TypeIdE" ]
   },
   {
@@ -1322,7 +1322,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7FieldIdE", "_ZTIPKN3art3dex7FieldIdE" ]
   },
   {
@@ -1344,7 +1344,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7ProtoIdE", "_ZTIPKN3art3dex7ProtoIdE" ]
   },
   {
@@ -1366,7 +1366,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8ClassDefE", "_ZTIPKN3art3dex8ClassDefE" ]
   },
   {
@@ -1388,7 +1388,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8MethodIdE", "_ZTIPKN3art3dex8MethodIdE" ]
   },
   {
@@ -1410,7 +1410,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8StringIdE", "_ZTIPKN3art3dex8StringIdE" ]
   },
   {
@@ -1432,7 +1432,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art7DexFileE", "_ZTIPKN3art7DexFileE" ]
   },
   {
@@ -1454,7 +1454,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -1476,7 +1476,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -1498,7 +1498,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -1520,7 +1520,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -1542,7 +1542,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -1564,7 +1564,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -1586,7 +1586,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKt", "_ZTIPKt" ]
   },
   {
@@ -1608,7 +1608,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -1630,7 +1630,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -1652,7 +1652,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -1674,7 +1674,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -1696,7 +1696,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -1718,7 +1718,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -1740,7 +1740,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIb", "_ZTIb" ]
   },
   {
@@ -1762,7 +1762,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -1784,7 +1784,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIj" ]
   },
   {
@@ -1806,7 +1806,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIj" ]
   },
   {
@@ -1828,7 +1828,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIt" ]
   },
   {
@@ -1847,7 +1847,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -1866,7 +1866,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1876,7 +1876,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "rvalue_reference_types" :
@@ -1888,7 +1888,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   }
  ]
 }
diff --git a/30/64/x86_x86_64/source-based/libdexfiled_external.so.lsdump b/30/64/x86_x86_64/source-based/libdexfiled_external.so.lsdump
index a687330..e73bcbe 100644
--- a/30/64/x86_x86_64/source-based/libdexfiled_external.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libdexfiled_external.so.lsdump
@@ -162,7 +162,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -195,7 +195,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -377,7 +377,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -386,7 +386,7 @@
    "referenced_type" : "_ZTINSt3__15mutexE",
    "self_type" : "_ZTIRNSt3__15mutexE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "pointer_types" :
@@ -416,7 +416,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -425,7 +425,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -461,7 +461,7 @@
    "referenced_type" : "_ZTIKN3art3dex6TypeIdE",
    "self_type" : "_ZTIPKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -470,7 +470,7 @@
    "referenced_type" : "_ZTIKN3art3dex7FieldIdE",
    "self_type" : "_ZTIPKN3art3dex7FieldIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -479,7 +479,7 @@
    "referenced_type" : "_ZTIKN3art3dex7ProtoIdE",
    "self_type" : "_ZTIPKN3art3dex7ProtoIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -488,7 +488,7 @@
    "referenced_type" : "_ZTIKN3art3dex8ClassDefE",
    "self_type" : "_ZTIPKN3art3dex8ClassDefE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -497,7 +497,7 @@
    "referenced_type" : "_ZTIKN3art3dex8MethodIdE",
    "self_type" : "_ZTIPKN3art3dex8MethodIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -506,7 +506,7 @@
    "referenced_type" : "_ZTIKN3art3dex8StringIdE",
    "self_type" : "_ZTIPKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -515,7 +515,7 @@
    "referenced_type" : "_ZTIKN3art7DexFileE",
    "self_type" : "_ZTIPKN3art7DexFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -524,7 +524,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -533,7 +533,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -542,7 +542,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -551,7 +551,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -560,7 +560,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -578,7 +578,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -587,7 +587,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -605,7 +605,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -614,7 +614,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -623,7 +623,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -632,7 +632,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -641,7 +641,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -650,7 +650,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -659,7 +659,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -668,7 +668,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -677,7 +677,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -686,7 +686,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -695,7 +695,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -704,7 +704,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -713,7 +713,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -722,7 +722,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -731,7 +731,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -740,7 +740,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -749,7 +749,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -758,7 +758,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -767,7 +767,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -776,7 +776,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -785,7 +785,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -794,7 +794,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -803,7 +803,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -812,7 +812,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIbbEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -821,7 +821,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -830,7 +830,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIjjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -839,7 +839,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorItjEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -848,7 +848,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -857,7 +857,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -866,7 +866,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIPN7android4base19ScopedLockAssertionE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   },
   {
    "alignment" : 4,
@@ -893,7 +893,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -902,7 +902,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -911,7 +911,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -962,7 +962,7 @@
    "referenced_type" : "_ZTIN3art3dex6TypeIdE",
    "self_type" : "_ZTIKN3art3dex6TypeIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -972,7 +972,7 @@
    "referenced_type" : "_ZTIN3art3dex7FieldIdE",
    "self_type" : "_ZTIKN3art3dex7FieldIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -982,7 +982,7 @@
    "referenced_type" : "_ZTIN3art3dex7ProtoIdE",
    "self_type" : "_ZTIKN3art3dex7ProtoIdE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -992,7 +992,7 @@
    "referenced_type" : "_ZTIN3art3dex8ClassDefE",
    "self_type" : "_ZTIKN3art3dex8ClassDefE",
    "size" : 32,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1002,7 +1002,7 @@
    "referenced_type" : "_ZTIN3art3dex8MethodIdE",
    "self_type" : "_ZTIKN3art3dex8MethodIdE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1012,7 +1012,7 @@
    "referenced_type" : "_ZTIN3art3dex8StringIdE",
    "self_type" : "_ZTIKN3art3dex8StringIdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1022,7 +1022,7 @@
    "referenced_type" : "_ZTIN3art7DexFileE",
    "self_type" : "_ZTIKN3art7DexFileE",
    "size" : 96,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1032,7 +1032,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1042,7 +1042,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1052,7 +1052,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1062,7 +1062,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1072,7 +1072,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1082,7 +1082,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1092,7 +1092,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1112,7 +1112,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1122,7 +1122,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 2,
@@ -1132,7 +1132,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -1187,7 +1187,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1205,7 +1205,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -1235,7 +1235,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
+   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -1252,7 +1252,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -1261,7 +1261,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -1279,7 +1279,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
+   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -1300,7 +1300,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex6TypeIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex6TypeIdE", "_ZTIPKN3art3dex6TypeIdE" ]
   },
   {
@@ -1322,7 +1322,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7FieldIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7FieldIdE", "_ZTIPKN3art3dex7FieldIdE" ]
   },
   {
@@ -1344,7 +1344,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex7ProtoIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex7ProtoIdE", "_ZTIPKN3art3dex7ProtoIdE" ]
   },
   {
@@ -1366,7 +1366,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8ClassDefES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8ClassDefE", "_ZTIPKN3art3dex8ClassDefE" ]
   },
   {
@@ -1388,7 +1388,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8MethodIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8MethodIdE", "_ZTIPKN3art3dex8MethodIdE" ]
   },
   {
@@ -1410,7 +1410,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art3dex8StringIdES6_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art3dex8StringIdE", "_ZTIPKN3art3dex8StringIdE" ]
   },
   {
@@ -1432,7 +1432,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKN3art7DexFileES5_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKN3art7DexFileE", "_ZTIPKN3art7DexFileE" ]
   },
   {
@@ -1454,7 +1454,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -1476,7 +1476,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -1498,7 +1498,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -1520,7 +1520,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -1542,7 +1542,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -1564,7 +1564,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -1586,7 +1586,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKtS3_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKt", "_ZTIPKt" ]
   },
   {
@@ -1608,7 +1608,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -1630,7 +1630,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -1652,7 +1652,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -1674,7 +1674,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -1696,7 +1696,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -1718,7 +1718,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -1740,7 +1740,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIbbEE",
    "size" : 2,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIb", "_ZTIb" ]
   },
   {
@@ -1762,7 +1762,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -1784,7 +1784,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIjjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIj", "_ZTIj" ]
   },
   {
@@ -1806,7 +1806,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorItjEE",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIj" ]
   },
   {
@@ -1828,7 +1828,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIttEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h",
+   "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "_ZTIt", "_ZTIt" ]
   },
   {
@@ -1847,7 +1847,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -1866,7 +1866,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/logging.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -1876,7 +1876,7 @@
    "referenced_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "self_type" : "_ZTIN7android4base19ScopedLockAssertionE",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/thread_annotations.h"
+   "source_file" : "/system/core/base/include/android-base/thread_annotations.h"
   }
  ],
  "rvalue_reference_types" :
@@ -1888,7 +1888,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   }
  ]
 }