Merge RQ2A.210305.007android-s-beta-5 android-s-beta-4 android-s-beta-3 android-s-beta-2 android-s-beta-1 android-s-beta-5 android-s-beta-4

Bug: 180401296 Merged-In: I589f341a0536d6b1af348a234a36b17f9437d35a Change-Id: I0c1f067ef5be90afa7525237d14674b6c14147c9
author: Xin Li <delphij@google.com> 2021-03-02 15:49:54 -0800
committer: Xin Li <delphij@google.com> 2021-03-03 09:12:27 -0800
commit: 06bc70f4871ce23b19931c8e9d2633da240383b4 (patch)
tree: 82530bb438dcba1f4284df74b06527b90848c8f6
parent: ae0dfec78a2678cd986e92000335de529453002b (diff)
parent: 116a8add8ceeb82479a50bfdeeadf7b5ad34680a (diff)
download: vndk-android-s-beta-3.tar.gz
16 files changed, 4521 insertions, 4521 deletions
diff --git a/29/32/arm_armv7-a-neon/source-based/libbase.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libbase.so.lsdump
index d71e3731..dbbc0c59 100644
--- a/29/32/arm_armv7-a-neon/source-based/libbase.so.lsdump
+++ b/29/32/arm_armv7-a-neon/source-based/libbase.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-9",
    "size" : 1024,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   }
  ],
  "builtin_types" :
@@ -674,7 +674,7 @@
    "referenced_type" : "type-30",
    "self_type" : "type-30",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "type-31",
    "unique_id" : "_ZTSN7android4base5LogIdE"
   },
@@ -716,7 +716,7 @@
    "referenced_type" : "type-51",
    "self_type" : "type-51",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "type-31",
    "unique_id" : "_ZTSN7android4base11LogSeverityE"
   }
@@ -739,7 +739,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -752,7 +752,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -765,7 +765,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -778,7 +778,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -791,7 +791,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "CapturedStdFd::str",
@@ -804,7 +804,7 @@
     }
    ],
    "return_type" : "type-227",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Stop",
@@ -817,7 +817,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Reset",
@@ -830,7 +830,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Start",
@@ -843,7 +843,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -859,7 +859,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -875,7 +875,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -888,7 +888,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -901,7 +901,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "access" : "private",
@@ -918,7 +918,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::release",
@@ -931,7 +931,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -947,7 +947,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -960,7 +960,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -976,7 +976,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -989,7 +989,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -1002,7 +1002,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -1015,7 +1015,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::LogMessage::stream",
@@ -1028,7 +1028,7 @@
     }
    ],
    "return_type" : "type-47",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogLine",
@@ -1055,7 +1055,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -1086,7 +1086,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -1117,7 +1117,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -1130,7 +1130,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -1143,7 +1143,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -1160,7 +1160,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -1177,7 +1177,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::operator()",
@@ -1208,7 +1208,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromFd",
@@ -1229,7 +1229,7 @@
     }
    ],
    "return_type" : "type-228",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -1242,7 +1242,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -1255,7 +1255,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::SetAborter",
@@ -1267,7 +1267,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -1282,7 +1282,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -1297,7 +1297,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::WriteFully",
@@ -1315,13 +1315,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::boot_clock::now",
    "linker_set_key" : "_ZN7android4base10boot_clock3nowEv",
    "return_type" : "type-232",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "function_name" : "android::base::GetProperty",
@@ -1336,13 +1336,13 @@
     }
    ],
    "return_type" : "type-233",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::GetThreadId",
    "linker_set_key" : "_ZN7android4base11GetThreadIdEv",
    "return_type" : "type-71",
-   "source_file" : "/system/core/base/include/android-base/threads.h"
+   "source_file" : "/system/libbase/include/android-base/threads.h"
   },
   {
    "function_name" : "android::base::InitLogging",
@@ -1362,7 +1362,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetProperty",
@@ -1377,7 +1377,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::StdioLogger",
@@ -1404,7 +1404,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::KernelLogger",
@@ -1431,7 +1431,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StderrLogger",
@@ -1458,7 +1458,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringPrintf",
@@ -1470,13 +1470,13 @@
     }
    ],
    "return_type" : "type-234",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::GetDefaultTag",
    "linker_set_key" : "_ZN7android4base13GetDefaultTagEv",
    "return_type" : "type-235",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetDefaultTag",
@@ -1488,7 +1488,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringAppendF",
@@ -1503,7 +1503,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringAppendV",
@@ -1521,7 +1521,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::DefaultAborter",
@@ -1533,7 +1533,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ReadFdToString",
@@ -1548,7 +1548,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetBoolProperty",
@@ -1563,7 +1563,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::ParseNetAddress",
@@ -1587,7 +1587,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "function_name" : "android::base::WaitForProperty",
@@ -1606,7 +1606,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::WriteStringToFd",
@@ -1621,7 +1621,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EqualsIgnoreCase",
@@ -1636,7 +1636,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::ReadFileToString",
@@ -1655,13 +1655,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetExecutablePath",
    "linker_set_key" : "_ZN7android4base17GetExecutablePathEv",
    "return_type" : "type-240",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ReadFullyAtOffset",
@@ -1682,7 +1682,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -1698,7 +1698,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -1714,7 +1714,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -1727,7 +1727,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -1740,7 +1740,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -1759,7 +1759,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -1787,7 +1787,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWithIgnoreCase",
@@ -1802,7 +1802,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::RemoveFileIfExists",
@@ -1818,7 +1818,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::StartsWithIgnoreCase",
@@ -1833,13 +1833,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::GetMinimumLogSeverity",
    "linker_set_key" : "_ZN7android4base21GetMinimumLogSeverityEv",
    "return_type" : "type-51",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetMinimumLogSeverity",
@@ -1851,13 +1851,13 @@
     }
    ],
    "return_type" : "type-51",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::GetExecutableDirectory",
    "linker_set_key" : "_ZN7android4base22GetExecutableDirectoryEv",
    "return_type" : "type-245",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SystemErrorCodeToString",
@@ -1869,7 +1869,7 @@
     }
    ],
    "return_type" : "type-246",
-   "source_file" : "/system/core/base/include/android-base/errors.h"
+   "source_file" : "/system/libbase/include/android-base/errors.h"
   },
   {
    "function_name" : "android::base::WaitForPropertyCreation",
@@ -1885,7 +1885,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::SendFileDescriptorVector",
@@ -1906,7 +1906,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::ReceiveFileDescriptorVector",
@@ -1930,7 +1930,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::Join",
@@ -1945,7 +1945,7 @@
     }
    ],
    "return_type" : "type-248",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-249", "type-148" ]
   },
   {
@@ -1961,7 +1961,7 @@
     }
    ],
    "return_type" : "type-250",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-251", "type-10" ]
   },
   {
@@ -1977,7 +1977,7 @@
     }
    ],
    "return_type" : "type-252",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-253", "type-148" ]
   },
   {
@@ -1993,7 +1993,7 @@
     }
    ],
    "return_type" : "type-254",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-255", "type-10" ]
   },
   {
@@ -2006,7 +2006,7 @@
     }
    ],
    "return_type" : "type-256",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Split",
@@ -2021,7 +2021,7 @@
     }
    ],
    "return_type" : "type-257",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Dirname",
@@ -2033,7 +2033,7 @@
     }
    ],
    "return_type" : "type-258",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Basename",
@@ -2045,7 +2045,7 @@
     }
    ],
    "return_type" : "type-259",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -2060,7 +2060,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -2075,7 +2075,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Readlink",
@@ -2090,7 +2090,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Realpath",
@@ -2105,7 +2105,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ParseUint",
@@ -2128,7 +2128,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-189" ]
   },
   {
@@ -2152,7 +2152,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-31" ]
   },
   {
@@ -2176,7 +2176,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-64" ]
   },
   {
@@ -2200,7 +2200,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-71" ]
   },
   {
@@ -2219,7 +2219,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SetLogger",
@@ -2231,7 +2231,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::operator<<",
@@ -2246,7 +2246,7 @@
     }
    ],
    "return_type" : "type-223",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -2260,7 +2260,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   }
  ],
  "global_vars" : [],
@@ -2273,7 +2273,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-65",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2282,7 +2282,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-118",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2291,7 +2291,7 @@
    "referenced_type" : "type-120",
    "self_type" : "type-119",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2300,7 +2300,7 @@
    "referenced_type" : "type-13",
    "self_type" : "type-23",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2309,7 +2309,7 @@
    "referenced_type" : "type-134",
    "self_type" : "type-136",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2318,7 +2318,7 @@
    "referenced_type" : "type-140",
    "self_type" : "type-142",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -2327,7 +2327,7 @@
    "referenced_type" : "type-146",
    "self_type" : "type-148",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2336,7 +2336,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2345,7 +2345,7 @@
    "referenced_type" : "type-270",
    "self_type" : "type-278",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2354,7 +2354,7 @@
    "referenced_type" : "type-281",
    "self_type" : "type-280",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2363,7 +2363,7 @@
    "referenced_type" : "type-302",
    "self_type" : "type-304",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2372,7 +2372,7 @@
    "referenced_type" : "type-312",
    "self_type" : "type-316",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -2381,7 +2381,7 @@
    "referenced_type" : "type-321",
    "self_type" : "type-323",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2390,7 +2390,7 @@
    "referenced_type" : "type-58",
    "self_type" : "type-60",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2399,7 +2399,7 @@
    "referenced_type" : "type-74",
    "self_type" : "type-79",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -2408,7 +2408,7 @@
    "referenced_type" : "type-153",
    "self_type" : "type-155",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2417,7 +2417,7 @@
    "referenced_type" : "type-327",
    "self_type" : "type-329",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2426,7 +2426,7 @@
    "referenced_type" : "type-319",
    "self_type" : "type-330",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2435,7 +2435,7 @@
    "referenced_type" : "type-82",
    "self_type" : "type-91",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2444,7 +2444,7 @@
    "referenced_type" : "type-86",
    "self_type" : "type-88",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2453,7 +2453,7 @@
    "referenced_type" : "type-149",
    "self_type" : "type-152",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2462,7 +2462,7 @@
    "referenced_type" : "type-324",
    "self_type" : "type-326",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2471,7 +2471,7 @@
    "referenced_type" : "type-108",
    "self_type" : "type-107",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2480,7 +2480,7 @@
    "referenced_type" : "type-131",
    "self_type" : "type-130",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2489,7 +2489,7 @@
    "referenced_type" : "type-176",
    "self_type" : "type-175",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2498,7 +2498,7 @@
    "referenced_type" : "type-214",
    "self_type" : "type-213",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2507,7 +2507,7 @@
    "referenced_type" : "type-224",
    "self_type" : "type-223",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2516,7 +2516,7 @@
    "referenced_type" : "type-267",
    "self_type" : "type-266",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2525,7 +2525,7 @@
    "referenced_type" : "type-296",
    "self_type" : "type-295",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2534,7 +2534,7 @@
    "referenced_type" : "type-343",
    "self_type" : "type-342",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2543,7 +2543,7 @@
    "referenced_type" : "type-375",
    "self_type" : "type-374",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2552,7 +2552,7 @@
    "referenced_type" : "type-385",
    "self_type" : "type-384",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2561,7 +2561,7 @@
    "referenced_type" : "type-48",
    "self_type" : "type-47",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2570,7 +2570,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-4",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2579,7 +2579,7 @@
    "referenced_type" : "type-81",
    "self_type" : "type-80",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2588,7 +2588,7 @@
    "referenced_type" : "type-97",
    "self_type" : "type-96",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   }
  ],
  "pointer_types" :
@@ -2600,7 +2600,7 @@
    "referenced_type" : "type-157",
    "self_type" : "type-158",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2609,7 +2609,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-163",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2618,7 +2618,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-165",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2627,7 +2627,7 @@
    "referenced_type" : "type-117",
    "self_type" : "type-116",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2636,7 +2636,7 @@
    "referenced_type" : "type-22",
    "self_type" : "type-21",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2645,7 +2645,7 @@
    "referenced_type" : "type-277",
    "self_type" : "type-276",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2654,7 +2654,7 @@
    "referenced_type" : "type-291",
    "self_type" : "type-290",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2663,7 +2663,7 @@
    "referenced_type" : "type-40",
    "self_type" : "type-39",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2672,7 +2672,7 @@
    "referenced_type" : "type-85",
    "self_type" : "type-84",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2681,7 +2681,7 @@
    "referenced_type" : "type-221",
    "self_type" : "type-222",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2690,7 +2690,7 @@
    "referenced_type" : "type-7",
    "self_type" : "type-6",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2699,7 +2699,7 @@
    "referenced_type" : "type-102",
    "self_type" : "type-101",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2708,7 +2708,7 @@
    "referenced_type" : "type-115",
    "self_type" : "type-114",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2717,7 +2717,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-19",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2726,7 +2726,7 @@
    "referenced_type" : "type-220",
    "self_type" : "type-219",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2735,7 +2735,7 @@
    "referenced_type" : "type-275",
    "self_type" : "type-274",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2744,7 +2744,7 @@
    "referenced_type" : "type-381",
    "self_type" : "type-380",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2753,7 +2753,7 @@
    "referenced_type" : "type-177",
    "self_type" : "type-185",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2762,7 +2762,7 @@
    "referenced_type" : "type-166",
    "self_type" : "type-171",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2771,7 +2771,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-160",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2780,7 +2780,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-151",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2789,7 +2789,7 @@
    "referenced_type" : "type-198",
    "self_type" : "type-202",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2798,7 +2798,7 @@
    "referenced_type" : "type-203",
    "self_type" : "type-206",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2807,7 +2807,7 @@
    "referenced_type" : "type-186",
    "self_type" : "type-190",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2816,7 +2816,7 @@
    "referenced_type" : "type-191",
    "self_type" : "type-193",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2825,7 +2825,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-170",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2834,7 +2834,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-168",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2843,7 +2843,7 @@
    "referenced_type" : "type-208",
    "self_type" : "type-209",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2852,7 +2852,7 @@
    "referenced_type" : "type-210",
    "self_type" : "type-211",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2861,7 +2861,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-195",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2870,7 +2870,7 @@
    "referenced_type" : "type-196",
    "self_type" : "type-197",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2879,7 +2879,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-126",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2888,7 +2888,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-43",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2897,7 +2897,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-28",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2906,7 +2906,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-57",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -2915,7 +2915,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-49",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2924,7 +2924,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-207",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2933,7 +2933,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-205",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2942,7 +2942,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-33",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2951,7 +2951,7 @@
    "referenced_type" : "type-33",
    "self_type" : "type-32",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2960,7 +2960,7 @@
    "referenced_type" : "type-159",
    "self_type" : "type-161",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2969,7 +2969,7 @@
    "referenced_type" : "type-129",
    "self_type" : "type-133",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2978,7 +2978,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-215",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2987,7 +2987,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-18",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2996,7 +2996,7 @@
    "referenced_type" : "type-24",
    "self_type" : "type-38",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -3005,7 +3005,7 @@
    "referenced_type" : "type-200",
    "self_type" : "type-199",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3014,7 +3014,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-111",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3023,7 +3023,7 @@
    "referenced_type" : "type-120",
    "self_type" : "type-132",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3032,7 +3032,7 @@
    "referenced_type" : "type-13",
    "self_type" : "type-12",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3041,7 +3041,7 @@
    "referenced_type" : "type-178",
    "self_type" : "type-180",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3050,7 +3050,7 @@
    "referenced_type" : "type-216",
    "self_type" : "type-218",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3059,7 +3059,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-52",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3068,7 +3068,7 @@
    "referenced_type" : "type-270",
    "self_type" : "type-269",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3077,7 +3077,7 @@
    "referenced_type" : "type-281",
    "self_type" : "type-298",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3086,7 +3086,7 @@
    "referenced_type" : "type-344",
    "self_type" : "type-346",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3095,7 +3095,7 @@
    "referenced_type" : "type-377",
    "self_type" : "type-379",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3104,7 +3104,7 @@
    "referenced_type" : "type-98",
    "self_type" : "type-100",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3113,7 +3113,7 @@
    "referenced_type" : "type-188",
    "self_type" : "type-187",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3122,7 +3122,7 @@
    "referenced_type" : "type-55",
    "self_type" : "type-69",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3131,7 +3131,7 @@
    "referenced_type" : "type-8",
    "self_type" : "type-53",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3140,7 +3140,7 @@
    "referenced_type" : "type-78",
    "self_type" : "type-77",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3149,7 +3149,7 @@
    "referenced_type" : "type-73",
    "self_type" : "type-76",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3158,7 +3158,7 @@
    "referenced_type" : "type-201",
    "self_type" : "type-204",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3167,7 +3167,7 @@
    "referenced_type" : "type-104",
    "self_type" : "type-103",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3176,7 +3176,7 @@
    "referenced_type" : "type-138",
    "self_type" : "type-137",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3185,7 +3185,7 @@
    "referenced_type" : "type-145",
    "self_type" : "type-144",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "alignment" : 4,
@@ -3194,7 +3194,7 @@
    "referenced_type" : "type-226",
    "self_type" : "type-225",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3203,7 +3203,7 @@
    "referenced_type" : "type-306",
    "self_type" : "type-305",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3212,7 +3212,7 @@
    "referenced_type" : "type-318",
    "self_type" : "type-317",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "alignment" : 4,
@@ -3221,7 +3221,7 @@
    "referenced_type" : "type-387",
    "self_type" : "type-386",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3230,7 +3230,7 @@
    "referenced_type" : "type-62",
    "self_type" : "type-61",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3239,7 +3239,7 @@
    "referenced_type" : "type-332",
    "self_type" : "type-331",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3248,7 +3248,7 @@
    "referenced_type" : "type-90",
    "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3257,7 +3257,7 @@
    "referenced_type" : "type-93",
    "self_type" : "type-92",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3266,7 +3266,7 @@
    "referenced_type" : "type-189",
    "self_type" : "type-192",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3275,7 +3275,7 @@
    "referenced_type" : "type-31",
    "self_type" : "type-70",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3284,7 +3284,7 @@
    "referenced_type" : "type-71",
    "self_type" : "type-72",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3293,7 +3293,7 @@
    "referenced_type" : "type-64",
    "self_type" : "type-63",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3302,7 +3302,7 @@
    "referenced_type" : "type-56",
    "self_type" : "type-172",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   }
  ],
  "qualified_types" :
@@ -3315,7 +3315,7 @@
    "referenced_type" : "type-157",
    "self_type" : "type-159",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -3325,7 +3325,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-129",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3335,7 +3335,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-66",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -3345,7 +3345,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-15",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -3355,7 +3355,7 @@
    "referenced_type" : "type-11",
    "self_type" : "type-139",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -3365,7 +3365,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-24",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -3375,7 +3375,7 @@
    "referenced_type" : "type-8",
    "self_type" : "type-110",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -3385,7 +3385,7 @@
    "referenced_type" : "type-201",
    "self_type" : "type-200",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3395,7 +3395,7 @@
    "referenced_type" : "type-113",
    "self_type" : "type-112",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3405,7 +3405,7 @@
    "referenced_type" : "type-121",
    "self_type" : "type-120",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3415,7 +3415,7 @@
    "referenced_type" : "type-135",
    "self_type" : "type-134",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3425,7 +3425,7 @@
    "referenced_type" : "type-141",
    "self_type" : "type-140",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -3435,7 +3435,7 @@
    "referenced_type" : "type-147",
    "self_type" : "type-146",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3445,7 +3445,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3455,7 +3455,7 @@
    "referenced_type" : "type-179",
    "self_type" : "type-178",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3465,7 +3465,7 @@
    "referenced_type" : "type-217",
    "self_type" : "type-216",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3475,7 +3475,7 @@
    "referenced_type" : "type-271",
    "self_type" : "type-270",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3485,7 +3485,7 @@
    "referenced_type" : "type-27",
    "self_type" : "type-26",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3495,7 +3495,7 @@
    "referenced_type" : "type-282",
    "self_type" : "type-281",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3505,7 +3505,7 @@
    "referenced_type" : "type-303",
    "self_type" : "type-302",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3515,7 +3515,7 @@
    "referenced_type" : "type-313",
    "self_type" : "type-312",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -3525,7 +3525,7 @@
    "referenced_type" : "type-322",
    "self_type" : "type-321",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3535,7 +3535,7 @@
    "referenced_type" : "type-345",
    "self_type" : "type-344",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3545,7 +3545,7 @@
    "referenced_type" : "type-378",
    "self_type" : "type-377",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3555,7 +3555,7 @@
    "referenced_type" : "type-59",
    "self_type" : "type-58",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3565,7 +3565,7 @@
    "referenced_type" : "type-75",
    "self_type" : "type-74",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -3575,7 +3575,7 @@
    "referenced_type" : "type-99",
    "self_type" : "type-98",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3585,7 +3585,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-105",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3595,7 +3595,7 @@
    "referenced_type" : "type-128",
    "self_type" : "type-127",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3605,7 +3605,7 @@
    "referenced_type" : "type-174",
    "self_type" : "type-173",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3615,7 +3615,7 @@
    "referenced_type" : "type-265",
    "self_type" : "type-264",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3625,7 +3625,7 @@
    "referenced_type" : "type-293",
    "self_type" : "type-292",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3635,7 +3635,7 @@
    "referenced_type" : "type-341",
    "self_type" : "type-340",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3645,7 +3645,7 @@
    "referenced_type" : "type-372",
    "self_type" : "type-371",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3655,7 +3655,7 @@
    "referenced_type" : "type-3",
    "self_type" : "type-2",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3665,7 +3665,7 @@
    "referenced_type" : "type-42",
    "self_type" : "type-41",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3675,7 +3675,7 @@
    "referenced_type" : "type-46",
    "self_type" : "type-45",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3685,7 +3685,7 @@
    "referenced_type" : "type-95",
    "self_type" : "type-94",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3695,7 +3695,7 @@
    "referenced_type" : "type-154",
    "self_type" : "type-153",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3705,7 +3705,7 @@
    "referenced_type" : "type-328",
    "self_type" : "type-327",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3715,7 +3715,7 @@
    "referenced_type" : "type-320",
    "self_type" : "type-319",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3725,7 +3725,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-82",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3735,7 +3735,7 @@
    "referenced_type" : "type-87",
    "self_type" : "type-86",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3745,7 +3745,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-149",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3755,7 +3755,7 @@
    "referenced_type" : "type-325",
    "self_type" : "type-324",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 1,
@@ -3765,7 +3765,7 @@
    "referenced_type" : "type-189",
    "self_type" : "type-188",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -3773,7 +3773,7 @@
    "name" : "const void",
    "referenced_type" : "type-56",
    "self_type" : "type-55",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   }
  ],
  "record_types" :
@@ -3806,7 +3806,7 @@
    "referenced_type" : "type-157",
    "self_type" : "type-157",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS13CapturedStdFd"
   },
   {
@@ -3823,7 +3823,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-162",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS14CapturedStderr"
   },
   {
@@ -3840,7 +3840,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-164",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS14CapturedStdout"
   },
   {
@@ -3864,7 +3864,7 @@
    "referenced_type" : "type-221",
    "self_type" : "type-221",
    "size" : 1025,
-   "source_file" : "/system/core/base/include/android-base/file.h",
+   "source_file" : "/system/libbase/include/android-base/file.h",
    "unique_id" : "_ZTS12TemporaryDir"
   },
   {
@@ -3893,7 +3893,7 @@
    "referenced_type" : "type-7",
    "self_type" : "type-7",
    "size" : 1032,
-   "source_file" : "/system/core/base/include/android-base/file.h",
+   "source_file" : "/system/libbase/include/android-base/file.h",
    "unique_id" : "_ZTS13TemporaryFile"
   },
   {
@@ -3903,7 +3903,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-17",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -3925,7 +3925,7 @@
    "referenced_type" : "type-177",
    "self_type" : "type-177",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-33", "type-33" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
   },
@@ -3948,7 +3948,7 @@
    "referenced_type" : "type-166",
    "self_type" : "type-166",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-33", "type-38" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
   },
@@ -3971,7 +3971,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-156",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-38", "type-33" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
   },
@@ -3994,7 +3994,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-143",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-38", "type-38" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
   },
@@ -4017,7 +4017,7 @@
    "referenced_type" : "type-198",
    "self_type" : "type-198",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-199", "type-199" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
@@ -4040,7 +4040,7 @@
    "referenced_type" : "type-203",
    "self_type" : "type-203",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-199", "type-204" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
@@ -4063,7 +4063,7 @@
    "referenced_type" : "type-186",
    "self_type" : "type-186",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-187", "type-187" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
   },
@@ -4086,7 +4086,7 @@
    "referenced_type" : "type-191",
    "self_type" : "type-191",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-187", "type-192" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
   },
@@ -4109,7 +4109,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-169",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-8", "type-8" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIiiEE"
   },
@@ -4132,7 +4132,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-167",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-8", "type-78" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIixEE"
   },
@@ -4155,7 +4155,7 @@
    "referenced_type" : "type-208",
    "self_type" : "type-208",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-204", "type-199" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
@@ -4178,7 +4178,7 @@
    "referenced_type" : "type-210",
    "self_type" : "type-210",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-204", "type-204" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
@@ -4201,7 +4201,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-194",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-192", "type-187" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
   },
@@ -4224,7 +4224,7 @@
    "referenced_type" : "type-196",
    "self_type" : "type-196",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-192", "type-192" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
   },
@@ -4244,7 +4244,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-109",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
   },
   {
@@ -4263,7 +4263,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-44",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
   },
   {
@@ -4282,7 +4282,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-29",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
   },
   {
@@ -4313,7 +4313,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-54",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h",
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h",
    "unique_id" : "_ZTSN7android4base10MappedFileE"
   },
   {
@@ -4332,7 +4332,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-50",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
   },
   {
@@ -4351,7 +4351,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-67",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h",
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h",
    "unique_id" : "_ZTSN7android4base5TimerE"
   },
   {
@@ -4362,7 +4362,7 @@
    "referenced_type" : "type-1",
    "self_type" : "type-1",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h",
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h",
    "unique_id" : "_ZTSN7android4base10boot_clockE"
   },
   {
@@ -4381,7 +4381,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-16",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "template_args" : [ "type-17" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   }
@@ -4395,7 +4395,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-212",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -4404,7 +4404,7 @@
    "referenced_type" : "type-123",
    "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -4413,7 +4413,7 @@
    "referenced_type" : "type-286",
    "self_type" : "type-285",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -4422,7 +4422,7 @@
    "referenced_type" : "type-35",
    "self_type" : "type-34",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -4431,7 +4431,7 @@
    "referenced_type" : "type-125",
    "self_type" : "type-124",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -4440,7 +4440,7 @@
    "referenced_type" : "type-288",
    "self_type" : "type-287",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -4449,7 +4449,7 @@
    "referenced_type" : "type-37",
    "self_type" : "type-36",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   }
  ]
 }
diff --git a/29/32/x86/source-based/libbase.so.lsdump b/29/32/x86/source-based/libbase.so.lsdump
index 9e0bea27..689f1f36 100644
--- a/29/32/x86/source-based/libbase.so.lsdump
+++ b/29/32/x86/source-based/libbase.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-9",
    "size" : 1024,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   }
  ],
  "builtin_types" :
@@ -593,7 +593,7 @@
    "referenced_type" : "type-30",
    "self_type" : "type-30",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "type-31",
    "unique_id" : "_ZTSN7android4base5LogIdE"
   },
@@ -635,7 +635,7 @@
    "referenced_type" : "type-51",
    "self_type" : "type-51",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "type-31",
    "unique_id" : "_ZTSN7android4base11LogSeverityE"
   }
@@ -658,7 +658,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -671,7 +671,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -684,7 +684,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -697,7 +697,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -710,7 +710,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "CapturedStdFd::str",
@@ -723,7 +723,7 @@
     }
    ],
    "return_type" : "type-223",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Stop",
@@ -736,7 +736,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Reset",
@@ -749,7 +749,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Start",
@@ -762,7 +762,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -778,7 +778,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -794,7 +794,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -807,7 +807,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -820,7 +820,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "access" : "private",
@@ -837,7 +837,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::release",
@@ -850,7 +850,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -866,7 +866,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -879,7 +879,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -895,7 +895,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -908,7 +908,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -921,7 +921,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -934,7 +934,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::LogMessage::stream",
@@ -947,7 +947,7 @@
     }
    ],
    "return_type" : "type-47",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogLine",
@@ -974,7 +974,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -1005,7 +1005,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -1036,7 +1036,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -1049,7 +1049,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -1062,7 +1062,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -1079,7 +1079,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -1096,7 +1096,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::operator()",
@@ -1127,7 +1127,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromFd",
@@ -1148,7 +1148,7 @@
     }
    ],
    "return_type" : "type-224",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -1161,7 +1161,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -1174,7 +1174,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::SetAborter",
@@ -1186,7 +1186,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -1201,7 +1201,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -1216,7 +1216,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::WriteFully",
@@ -1234,13 +1234,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::boot_clock::now",
    "linker_set_key" : "_ZN7android4base10boot_clock3nowEv",
    "return_type" : "type-228",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "function_name" : "android::base::GetProperty",
@@ -1255,13 +1255,13 @@
     }
    ],
    "return_type" : "type-229",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::GetThreadId",
    "linker_set_key" : "_ZN7android4base11GetThreadIdEv",
    "return_type" : "type-71",
-   "source_file" : "/system/core/base/include/android-base/threads.h"
+   "source_file" : "/system/libbase/include/android-base/threads.h"
   },
   {
    "function_name" : "android::base::InitLogging",
@@ -1281,7 +1281,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetProperty",
@@ -1296,7 +1296,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::StdioLogger",
@@ -1323,7 +1323,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::KernelLogger",
@@ -1350,7 +1350,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StderrLogger",
@@ -1377,7 +1377,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringPrintf",
@@ -1389,13 +1389,13 @@
     }
    ],
    "return_type" : "type-230",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::GetDefaultTag",
    "linker_set_key" : "_ZN7android4base13GetDefaultTagEv",
    "return_type" : "type-231",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetDefaultTag",
@@ -1407,7 +1407,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringAppendF",
@@ -1422,7 +1422,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringAppendV",
@@ -1440,7 +1440,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::DefaultAborter",
@@ -1452,7 +1452,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ReadFdToString",
@@ -1467,7 +1467,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetBoolProperty",
@@ -1482,7 +1482,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::ParseNetAddress",
@@ -1506,7 +1506,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "function_name" : "android::base::WaitForProperty",
@@ -1525,7 +1525,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::WriteStringToFd",
@@ -1540,7 +1540,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EqualsIgnoreCase",
@@ -1555,7 +1555,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::ReadFileToString",
@@ -1574,13 +1574,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetExecutablePath",
    "linker_set_key" : "_ZN7android4base17GetExecutablePathEv",
    "return_type" : "type-235",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ReadFullyAtOffset",
@@ -1601,7 +1601,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -1617,7 +1617,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -1633,7 +1633,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -1646,7 +1646,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -1659,7 +1659,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -1678,7 +1678,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -1706,7 +1706,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWithIgnoreCase",
@@ -1721,7 +1721,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::RemoveFileIfExists",
@@ -1737,7 +1737,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::StartsWithIgnoreCase",
@@ -1752,13 +1752,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::GetMinimumLogSeverity",
    "linker_set_key" : "_ZN7android4base21GetMinimumLogSeverityEv",
    "return_type" : "type-51",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetMinimumLogSeverity",
@@ -1770,13 +1770,13 @@
     }
    ],
    "return_type" : "type-51",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::GetExecutableDirectory",
    "linker_set_key" : "_ZN7android4base22GetExecutableDirectoryEv",
    "return_type" : "type-240",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SystemErrorCodeToString",
@@ -1788,7 +1788,7 @@
     }
    ],
    "return_type" : "type-241",
-   "source_file" : "/system/core/base/include/android-base/errors.h"
+   "source_file" : "/system/libbase/include/android-base/errors.h"
   },
   {
    "function_name" : "android::base::WaitForPropertyCreation",
@@ -1804,7 +1804,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::SendFileDescriptorVector",
@@ -1825,7 +1825,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::ReceiveFileDescriptorVector",
@@ -1849,7 +1849,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::Join",
@@ -1864,7 +1864,7 @@
     }
    ],
    "return_type" : "type-243",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-244", "type-148" ]
   },
   {
@@ -1880,7 +1880,7 @@
     }
    ],
    "return_type" : "type-245",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-246", "type-10" ]
   },
   {
@@ -1896,7 +1896,7 @@
     }
    ],
    "return_type" : "type-247",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-248", "type-148" ]
   },
   {
@@ -1912,7 +1912,7 @@
     }
    ],
    "return_type" : "type-249",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-250", "type-10" ]
   },
   {
@@ -1925,7 +1925,7 @@
     }
    ],
    "return_type" : "type-251",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Split",
@@ -1940,7 +1940,7 @@
     }
    ],
    "return_type" : "type-252",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Dirname",
@@ -1952,7 +1952,7 @@
     }
    ],
    "return_type" : "type-253",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Basename",
@@ -1964,7 +1964,7 @@
     }
    ],
    "return_type" : "type-254",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -1979,7 +1979,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -1994,7 +1994,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Readlink",
@@ -2009,7 +2009,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Realpath",
@@ -2024,7 +2024,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ParseUint",
@@ -2047,7 +2047,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-185" ]
   },
   {
@@ -2071,7 +2071,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-31" ]
   },
   {
@@ -2095,7 +2095,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-64" ]
   },
   {
@@ -2119,7 +2119,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-71" ]
   },
   {
@@ -2138,7 +2138,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SetLogger",
@@ -2150,7 +2150,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::operator<<",
@@ -2165,7 +2165,7 @@
     }
    ],
    "return_type" : "type-219",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -2179,7 +2179,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   }
  ],
  "global_vars" : [],
@@ -2192,7 +2192,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-65",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2201,7 +2201,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-118",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2210,7 +2210,7 @@
    "referenced_type" : "type-120",
    "self_type" : "type-119",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2219,7 +2219,7 @@
    "referenced_type" : "type-13",
    "self_type" : "type-23",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2228,7 +2228,7 @@
    "referenced_type" : "type-134",
    "self_type" : "type-136",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2237,7 +2237,7 @@
    "referenced_type" : "type-140",
    "self_type" : "type-142",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -2246,7 +2246,7 @@
    "referenced_type" : "type-146",
    "self_type" : "type-148",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2255,7 +2255,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2264,7 +2264,7 @@
    "referenced_type" : "type-58",
    "self_type" : "type-60",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2273,7 +2273,7 @@
    "referenced_type" : "type-74",
    "self_type" : "type-79",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -2282,7 +2282,7 @@
    "referenced_type" : "type-153",
    "self_type" : "type-155",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2291,7 +2291,7 @@
    "referenced_type" : "type-82",
    "self_type" : "type-91",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2300,7 +2300,7 @@
    "referenced_type" : "type-86",
    "self_type" : "type-88",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2309,7 +2309,7 @@
    "referenced_type" : "type-149",
    "self_type" : "type-152",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2318,7 +2318,7 @@
    "referenced_type" : "type-108",
    "self_type" : "type-107",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2327,7 +2327,7 @@
    "referenced_type" : "type-131",
    "self_type" : "type-130",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2336,7 +2336,7 @@
    "referenced_type" : "type-176",
    "self_type" : "type-175",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2345,7 +2345,7 @@
    "referenced_type" : "type-210",
    "self_type" : "type-209",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2354,7 +2354,7 @@
    "referenced_type" : "type-220",
    "self_type" : "type-219",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2363,7 +2363,7 @@
    "referenced_type" : "type-48",
    "self_type" : "type-47",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2372,7 +2372,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-4",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2381,7 +2381,7 @@
    "referenced_type" : "type-81",
    "self_type" : "type-80",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2390,7 +2390,7 @@
    "referenced_type" : "type-97",
    "self_type" : "type-96",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   }
  ],
  "pointer_types" :
@@ -2402,7 +2402,7 @@
    "referenced_type" : "type-157",
    "self_type" : "type-158",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2411,7 +2411,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-163",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2420,7 +2420,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-165",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2429,7 +2429,7 @@
    "referenced_type" : "type-117",
    "self_type" : "type-116",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2438,7 +2438,7 @@
    "referenced_type" : "type-22",
    "self_type" : "type-21",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2447,7 +2447,7 @@
    "referenced_type" : "type-40",
    "self_type" : "type-39",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2456,7 +2456,7 @@
    "referenced_type" : "type-85",
    "self_type" : "type-84",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2465,7 +2465,7 @@
    "referenced_type" : "type-217",
    "self_type" : "type-218",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2474,7 +2474,7 @@
    "referenced_type" : "type-7",
    "self_type" : "type-6",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2483,7 +2483,7 @@
    "referenced_type" : "type-102",
    "self_type" : "type-101",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2492,7 +2492,7 @@
    "referenced_type" : "type-115",
    "self_type" : "type-114",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2501,7 +2501,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-19",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2510,7 +2510,7 @@
    "referenced_type" : "type-216",
    "self_type" : "type-215",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2519,7 +2519,7 @@
    "referenced_type" : "type-177",
    "self_type" : "type-181",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2528,7 +2528,7 @@
    "referenced_type" : "type-166",
    "self_type" : "type-171",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2537,7 +2537,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-160",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2546,7 +2546,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-151",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2555,7 +2555,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-198",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2564,7 +2564,7 @@
    "referenced_type" : "type-199",
    "self_type" : "type-202",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2573,7 +2573,7 @@
    "referenced_type" : "type-182",
    "self_type" : "type-186",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2582,7 +2582,7 @@
    "referenced_type" : "type-187",
    "self_type" : "type-189",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2591,7 +2591,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-170",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2600,7 +2600,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-168",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2609,7 +2609,7 @@
    "referenced_type" : "type-204",
    "self_type" : "type-205",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2618,7 +2618,7 @@
    "referenced_type" : "type-206",
    "self_type" : "type-207",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2627,7 +2627,7 @@
    "referenced_type" : "type-190",
    "self_type" : "type-191",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2636,7 +2636,7 @@
    "referenced_type" : "type-192",
    "self_type" : "type-193",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2645,7 +2645,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-126",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2654,7 +2654,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-43",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2663,7 +2663,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-28",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2672,7 +2672,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-57",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -2681,7 +2681,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-49",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2690,7 +2690,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-203",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2699,7 +2699,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-201",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2708,7 +2708,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-33",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2717,7 +2717,7 @@
    "referenced_type" : "type-33",
    "self_type" : "type-32",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2726,7 +2726,7 @@
    "referenced_type" : "type-159",
    "self_type" : "type-161",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2735,7 +2735,7 @@
    "referenced_type" : "type-129",
    "self_type" : "type-133",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2744,7 +2744,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-211",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2753,7 +2753,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-18",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2762,7 +2762,7 @@
    "referenced_type" : "type-24",
    "self_type" : "type-38",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2771,7 +2771,7 @@
    "referenced_type" : "type-196",
    "self_type" : "type-195",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2780,7 +2780,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-111",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2789,7 +2789,7 @@
    "referenced_type" : "type-120",
    "self_type" : "type-132",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2798,7 +2798,7 @@
    "referenced_type" : "type-13",
    "self_type" : "type-12",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2807,7 +2807,7 @@
    "referenced_type" : "type-178",
    "self_type" : "type-180",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2816,7 +2816,7 @@
    "referenced_type" : "type-212",
    "self_type" : "type-214",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2825,7 +2825,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-52",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2834,7 +2834,7 @@
    "referenced_type" : "type-98",
    "self_type" : "type-100",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2843,7 +2843,7 @@
    "referenced_type" : "type-184",
    "self_type" : "type-183",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2852,7 +2852,7 @@
    "referenced_type" : "type-55",
    "self_type" : "type-69",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2861,7 +2861,7 @@
    "referenced_type" : "type-8",
    "self_type" : "type-53",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2870,7 +2870,7 @@
    "referenced_type" : "type-78",
    "self_type" : "type-77",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2879,7 +2879,7 @@
    "referenced_type" : "type-73",
    "self_type" : "type-76",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2888,7 +2888,7 @@
    "referenced_type" : "type-197",
    "self_type" : "type-200",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2897,7 +2897,7 @@
    "referenced_type" : "type-104",
    "self_type" : "type-103",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2906,7 +2906,7 @@
    "referenced_type" : "type-138",
    "self_type" : "type-137",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2915,7 +2915,7 @@
    "referenced_type" : "type-145",
    "self_type" : "type-144",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "alignment" : 4,
@@ -2924,7 +2924,7 @@
    "referenced_type" : "type-222",
    "self_type" : "type-221",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2933,7 +2933,7 @@
    "referenced_type" : "type-62",
    "self_type" : "type-61",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2942,7 +2942,7 @@
    "referenced_type" : "type-90",
    "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2951,7 +2951,7 @@
    "referenced_type" : "type-93",
    "self_type" : "type-92",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2960,7 +2960,7 @@
    "referenced_type" : "type-185",
    "self_type" : "type-188",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2969,7 +2969,7 @@
    "referenced_type" : "type-31",
    "self_type" : "type-70",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2978,7 +2978,7 @@
    "referenced_type" : "type-71",
    "self_type" : "type-72",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2987,7 +2987,7 @@
    "referenced_type" : "type-64",
    "self_type" : "type-63",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2996,7 +2996,7 @@
    "referenced_type" : "type-56",
    "self_type" : "type-172",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   }
  ],
  "qualified_types" :
@@ -3009,7 +3009,7 @@
    "referenced_type" : "type-157",
    "self_type" : "type-159",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -3019,7 +3019,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-129",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3029,7 +3029,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-66",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -3039,7 +3039,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-15",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -3049,7 +3049,7 @@
    "referenced_type" : "type-11",
    "self_type" : "type-139",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -3059,7 +3059,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-24",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -3069,7 +3069,7 @@
    "referenced_type" : "type-8",
    "self_type" : "type-110",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -3079,7 +3079,7 @@
    "referenced_type" : "type-197",
    "self_type" : "type-196",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3089,7 +3089,7 @@
    "referenced_type" : "type-113",
    "self_type" : "type-112",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3099,7 +3099,7 @@
    "referenced_type" : "type-121",
    "self_type" : "type-120",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3109,7 +3109,7 @@
    "referenced_type" : "type-135",
    "self_type" : "type-134",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3119,7 +3119,7 @@
    "referenced_type" : "type-141",
    "self_type" : "type-140",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -3129,7 +3129,7 @@
    "referenced_type" : "type-147",
    "self_type" : "type-146",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3139,7 +3139,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3149,7 +3149,7 @@
    "referenced_type" : "type-179",
    "self_type" : "type-178",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3159,7 +3159,7 @@
    "referenced_type" : "type-213",
    "self_type" : "type-212",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3169,7 +3169,7 @@
    "referenced_type" : "type-27",
    "self_type" : "type-26",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3179,7 +3179,7 @@
    "referenced_type" : "type-59",
    "self_type" : "type-58",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3189,7 +3189,7 @@
    "referenced_type" : "type-75",
    "self_type" : "type-74",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -3199,7 +3199,7 @@
    "referenced_type" : "type-99",
    "self_type" : "type-98",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3209,7 +3209,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-105",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3219,7 +3219,7 @@
    "referenced_type" : "type-128",
    "self_type" : "type-127",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3229,7 +3229,7 @@
    "referenced_type" : "type-174",
    "self_type" : "type-173",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3239,7 +3239,7 @@
    "referenced_type" : "type-3",
    "self_type" : "type-2",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3249,7 +3249,7 @@
    "referenced_type" : "type-42",
    "self_type" : "type-41",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3259,7 +3259,7 @@
    "referenced_type" : "type-46",
    "self_type" : "type-45",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3269,7 +3269,7 @@
    "referenced_type" : "type-95",
    "self_type" : "type-94",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3279,7 +3279,7 @@
    "referenced_type" : "type-154",
    "self_type" : "type-153",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3289,7 +3289,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-82",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3299,7 +3299,7 @@
    "referenced_type" : "type-87",
    "self_type" : "type-86",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3309,7 +3309,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-149",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 1,
@@ -3319,7 +3319,7 @@
    "referenced_type" : "type-185",
    "self_type" : "type-184",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -3327,7 +3327,7 @@
    "name" : "const void",
    "referenced_type" : "type-56",
    "self_type" : "type-55",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   }
  ],
  "record_types" :
@@ -3360,7 +3360,7 @@
    "referenced_type" : "type-157",
    "self_type" : "type-157",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS13CapturedStdFd"
   },
   {
@@ -3377,7 +3377,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-162",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS14CapturedStderr"
   },
   {
@@ -3394,7 +3394,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-164",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS14CapturedStdout"
   },
   {
@@ -3418,7 +3418,7 @@
    "referenced_type" : "type-217",
    "self_type" : "type-217",
    "size" : 1025,
-   "source_file" : "/system/core/base/include/android-base/file.h",
+   "source_file" : "/system/libbase/include/android-base/file.h",
    "unique_id" : "_ZTS12TemporaryDir"
   },
   {
@@ -3447,7 +3447,7 @@
    "referenced_type" : "type-7",
    "self_type" : "type-7",
    "size" : 1032,
-   "source_file" : "/system/core/base/include/android-base/file.h",
+   "source_file" : "/system/libbase/include/android-base/file.h",
    "unique_id" : "_ZTS13TemporaryFile"
   },
   {
@@ -3457,7 +3457,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-17",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -3479,7 +3479,7 @@
    "referenced_type" : "type-177",
    "self_type" : "type-177",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-33", "type-33" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
   },
@@ -3502,7 +3502,7 @@
    "referenced_type" : "type-166",
    "self_type" : "type-166",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-33", "type-38" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
   },
@@ -3525,7 +3525,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-156",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-38", "type-33" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
   },
@@ -3548,7 +3548,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-143",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-38", "type-38" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
   },
@@ -3571,7 +3571,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-194",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-195", "type-195" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
@@ -3594,7 +3594,7 @@
    "referenced_type" : "type-199",
    "self_type" : "type-199",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-195", "type-200" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
@@ -3617,7 +3617,7 @@
    "referenced_type" : "type-182",
    "self_type" : "type-182",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-183", "type-183" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
   },
@@ -3640,7 +3640,7 @@
    "referenced_type" : "type-187",
    "self_type" : "type-187",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-183", "type-188" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
   },
@@ -3663,7 +3663,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-169",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-8", "type-8" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIiiEE"
   },
@@ -3686,7 +3686,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-167",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-8", "type-78" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIixEE"
   },
@@ -3709,7 +3709,7 @@
    "referenced_type" : "type-204",
    "self_type" : "type-204",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-200", "type-195" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
@@ -3732,7 +3732,7 @@
    "referenced_type" : "type-206",
    "self_type" : "type-206",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-200", "type-200" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
@@ -3755,7 +3755,7 @@
    "referenced_type" : "type-190",
    "self_type" : "type-190",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-188", "type-183" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
   },
@@ -3778,7 +3778,7 @@
    "referenced_type" : "type-192",
    "self_type" : "type-192",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-188", "type-188" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
   },
@@ -3798,7 +3798,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-109",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
   },
   {
@@ -3817,7 +3817,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-44",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
   },
   {
@@ -3836,7 +3836,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-29",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
   },
   {
@@ -3867,7 +3867,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-54",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h",
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h",
    "unique_id" : "_ZTSN7android4base10MappedFileE"
   },
   {
@@ -3886,7 +3886,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-50",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
   },
   {
@@ -3905,7 +3905,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-67",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h",
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h",
    "unique_id" : "_ZTSN7android4base5TimerE"
   },
   {
@@ -3916,7 +3916,7 @@
    "referenced_type" : "type-1",
    "self_type" : "type-1",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h",
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h",
    "unique_id" : "_ZTSN7android4base10boot_clockE"
   },
   {
@@ -3935,7 +3935,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-16",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "template_args" : [ "type-17" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   }
@@ -3949,7 +3949,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-208",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -3958,7 +3958,7 @@
    "referenced_type" : "type-123",
    "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3967,7 +3967,7 @@
    "referenced_type" : "type-35",
    "self_type" : "type-34",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3976,7 +3976,7 @@
    "referenced_type" : "type-125",
    "self_type" : "type-124",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3985,7 +3985,7 @@
    "referenced_type" : "type-37",
    "self_type" : "type-36",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   }
  ]
 }
diff --git a/29/64/arm64_armv8-a/source-based/libbase.so.lsdump b/29/64/arm64_armv8-a/source-based/libbase.so.lsdump
index 18e32b71..d64fbaf5 100644
--- a/29/64/arm64_armv8-a/source-based/libbase.so.lsdump
+++ b/29/64/arm64_armv8-a/source-based/libbase.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-9",
    "size" : 1024,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   }
  ],
  "builtin_types" :
@@ -582,7 +582,7 @@
    "referenced_type" : "type-30",
    "self_type" : "type-30",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "type-31",
    "unique_id" : "_ZTSN7android4base5LogIdE"
   },
@@ -624,7 +624,7 @@
    "referenced_type" : "type-51",
    "self_type" : "type-51",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "type-31",
    "unique_id" : "_ZTSN7android4base11LogSeverityE"
   }
@@ -647,7 +647,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -660,7 +660,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -673,7 +673,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -686,7 +686,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -699,7 +699,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "CapturedStdFd::str",
@@ -712,7 +712,7 @@
     }
    ],
    "return_type" : "type-223",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Stop",
@@ -725,7 +725,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Reset",
@@ -738,7 +738,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Start",
@@ -751,7 +751,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -767,7 +767,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -783,7 +783,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -796,7 +796,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -809,7 +809,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "access" : "private",
@@ -826,7 +826,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::release",
@@ -839,7 +839,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -855,7 +855,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -868,7 +868,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -884,7 +884,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -897,7 +897,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -910,7 +910,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -923,7 +923,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::LogMessage::stream",
@@ -936,7 +936,7 @@
     }
    ],
    "return_type" : "type-47",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogLine",
@@ -963,7 +963,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -994,7 +994,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -1025,7 +1025,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -1038,7 +1038,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -1051,7 +1051,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -1068,7 +1068,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -1085,7 +1085,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::operator()",
@@ -1116,7 +1116,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromFd",
@@ -1137,7 +1137,7 @@
     }
    ],
    "return_type" : "type-224",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -1150,7 +1150,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -1163,7 +1163,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::SetAborter",
@@ -1175,7 +1175,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -1190,7 +1190,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -1205,7 +1205,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::WriteFully",
@@ -1223,13 +1223,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::boot_clock::now",
    "linker_set_key" : "_ZN7android4base10boot_clock3nowEv",
    "return_type" : "type-228",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "function_name" : "android::base::GetProperty",
@@ -1244,13 +1244,13 @@
     }
    ],
    "return_type" : "type-229",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::GetThreadId",
    "linker_set_key" : "_ZN7android4base11GetThreadIdEv",
    "return_type" : "type-55",
-   "source_file" : "/system/core/base/include/android-base/threads.h"
+   "source_file" : "/system/libbase/include/android-base/threads.h"
   },
   {
    "function_name" : "android::base::InitLogging",
@@ -1270,7 +1270,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetProperty",
@@ -1285,7 +1285,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::StdioLogger",
@@ -1312,7 +1312,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::KernelLogger",
@@ -1339,7 +1339,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StderrLogger",
@@ -1366,7 +1366,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringPrintf",
@@ -1378,13 +1378,13 @@
     }
    ],
    "return_type" : "type-230",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::GetDefaultTag",
    "linker_set_key" : "_ZN7android4base13GetDefaultTagEv",
    "return_type" : "type-231",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetDefaultTag",
@@ -1396,7 +1396,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringAppendF",
@@ -1411,7 +1411,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringAppendV",
@@ -1429,7 +1429,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::DefaultAborter",
@@ -1441,7 +1441,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ReadFdToString",
@@ -1456,7 +1456,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetBoolProperty",
@@ -1471,7 +1471,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::ParseNetAddress",
@@ -1495,7 +1495,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "function_name" : "android::base::WaitForProperty",
@@ -1514,7 +1514,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::WriteStringToFd",
@@ -1529,7 +1529,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EqualsIgnoreCase",
@@ -1544,7 +1544,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::ReadFileToString",
@@ -1563,13 +1563,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetExecutablePath",
    "linker_set_key" : "_ZN7android4base17GetExecutablePathEv",
    "return_type" : "type-236",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ReadFullyAtOffset",
@@ -1590,7 +1590,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -1606,7 +1606,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -1622,7 +1622,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -1635,7 +1635,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -1648,7 +1648,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -1667,7 +1667,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -1695,7 +1695,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWithIgnoreCase",
@@ -1710,7 +1710,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::RemoveFileIfExists",
@@ -1726,7 +1726,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::StartsWithIgnoreCase",
@@ -1741,13 +1741,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::GetMinimumLogSeverity",
    "linker_set_key" : "_ZN7android4base21GetMinimumLogSeverityEv",
    "return_type" : "type-51",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetMinimumLogSeverity",
@@ -1759,13 +1759,13 @@
     }
    ],
    "return_type" : "type-51",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::GetExecutableDirectory",
    "linker_set_key" : "_ZN7android4base22GetExecutableDirectoryEv",
    "return_type" : "type-241",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SystemErrorCodeToString",
@@ -1777,7 +1777,7 @@
     }
    ],
    "return_type" : "type-242",
-   "source_file" : "/system/core/base/include/android-base/errors.h"
+   "source_file" : "/system/libbase/include/android-base/errors.h"
   },
   {
    "function_name" : "android::base::WaitForPropertyCreation",
@@ -1793,7 +1793,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::SendFileDescriptorVector",
@@ -1814,7 +1814,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::ReceiveFileDescriptorVector",
@@ -1838,7 +1838,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::Join",
@@ -1853,7 +1853,7 @@
     }
    ],
    "return_type" : "type-244",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-245", "type-146" ]
   },
   {
@@ -1869,7 +1869,7 @@
     }
    ],
    "return_type" : "type-246",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-247", "type-10" ]
   },
   {
@@ -1885,7 +1885,7 @@
     }
    ],
    "return_type" : "type-248",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-249", "type-146" ]
   },
   {
@@ -1901,7 +1901,7 @@
     }
    ],
    "return_type" : "type-250",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-251", "type-10" ]
   },
   {
@@ -1914,7 +1914,7 @@
     }
    ],
    "return_type" : "type-252",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Split",
@@ -1929,7 +1929,7 @@
     }
    ],
    "return_type" : "type-253",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Dirname",
@@ -1941,7 +1941,7 @@
     }
    ],
    "return_type" : "type-254",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Basename",
@@ -1953,7 +1953,7 @@
     }
    ],
    "return_type" : "type-255",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -1968,7 +1968,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -1983,7 +1983,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Readlink",
@@ -1998,7 +1998,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Realpath",
@@ -2013,7 +2013,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ParseUint",
@@ -2036,7 +2036,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-185" ]
   },
   {
@@ -2060,7 +2060,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-31" ]
   },
   {
@@ -2084,7 +2084,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-55" ]
   },
   {
@@ -2108,7 +2108,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-63" ]
   },
   {
@@ -2127,7 +2127,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SetLogger",
@@ -2139,7 +2139,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::operator<<",
@@ -2154,7 +2154,7 @@
     }
    ],
    "return_type" : "type-217",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -2168,7 +2168,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   }
  ],
  "global_vars" : [],
@@ -2181,7 +2181,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-64",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -2190,7 +2190,7 @@
    "referenced_type" : "type-110",
    "self_type" : "type-116",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -2199,7 +2199,7 @@
    "referenced_type" : "type-118",
    "self_type" : "type-117",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2208,7 +2208,7 @@
    "referenced_type" : "type-13",
    "self_type" : "type-23",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -2217,7 +2217,7 @@
    "referenced_type" : "type-132",
    "self_type" : "type-134",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 8,
@@ -2226,7 +2226,7 @@
    "referenced_type" : "type-138",
    "self_type" : "type-140",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -2235,7 +2235,7 @@
    "referenced_type" : "type-144",
    "self_type" : "type-146",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -2244,7 +2244,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2253,7 +2253,7 @@
    "referenced_type" : "type-58",
    "self_type" : "type-60",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 8,
@@ -2262,7 +2262,7 @@
    "referenced_type" : "type-74",
    "self_type" : "type-79",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -2271,7 +2271,7 @@
    "referenced_type" : "type-151",
    "self_type" : "type-153",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -2280,7 +2280,7 @@
    "referenced_type" : "type-84",
    "self_type" : "type-86",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -2289,7 +2289,7 @@
    "referenced_type" : "type-87",
    "self_type" : "type-91",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -2298,7 +2298,7 @@
    "referenced_type" : "type-147",
    "self_type" : "type-150",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -2307,7 +2307,7 @@
    "referenced_type" : "type-108",
    "self_type" : "type-107",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2316,7 +2316,7 @@
    "referenced_type" : "type-130",
    "self_type" : "type-129",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2325,7 +2325,7 @@
    "referenced_type" : "type-174",
    "self_type" : "type-173",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2334,7 +2334,7 @@
    "referenced_type" : "type-211",
    "self_type" : "type-210",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2343,7 +2343,7 @@
    "referenced_type" : "type-218",
    "self_type" : "type-217",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -2352,7 +2352,7 @@
    "referenced_type" : "type-48",
    "self_type" : "type-47",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2361,7 +2361,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-4",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2370,7 +2370,7 @@
    "referenced_type" : "type-81",
    "self_type" : "type-80",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -2379,7 +2379,7 @@
    "referenced_type" : "type-95",
    "self_type" : "type-94",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   }
  ],
  "pointer_types" :
@@ -2391,7 +2391,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-157",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -2400,7 +2400,7 @@
    "referenced_type" : "type-161",
    "self_type" : "type-162",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -2409,7 +2409,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-164",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -2418,7 +2418,7 @@
    "referenced_type" : "type-115",
    "self_type" : "type-114",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2427,7 +2427,7 @@
    "referenced_type" : "type-22",
    "self_type" : "type-21",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2436,7 +2436,7 @@
    "referenced_type" : "type-40",
    "self_type" : "type-39",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2445,7 +2445,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-82",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2454,7 +2454,7 @@
    "referenced_type" : "type-219",
    "self_type" : "type-220",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -2463,7 +2463,7 @@
    "referenced_type" : "type-7",
    "self_type" : "type-6",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -2472,7 +2472,7 @@
    "referenced_type" : "type-102",
    "self_type" : "type-101",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2481,7 +2481,7 @@
    "referenced_type" : "type-113",
    "self_type" : "type-112",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2490,7 +2490,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-19",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2499,7 +2499,7 @@
    "referenced_type" : "type-216",
    "self_type" : "type-215",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2508,7 +2508,7 @@
    "referenced_type" : "type-180",
    "self_type" : "type-181",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2517,7 +2517,7 @@
    "referenced_type" : "type-175",
    "self_type" : "type-179",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2526,7 +2526,7 @@
    "referenced_type" : "type-159",
    "self_type" : "type-169",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2535,7 +2535,7 @@
    "referenced_type" : "type-154",
    "self_type" : "type-155",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2544,7 +2544,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-199",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2553,7 +2553,7 @@
    "referenced_type" : "type-200",
    "self_type" : "type-203",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2562,7 +2562,7 @@
    "referenced_type" : "type-182",
    "self_type" : "type-186",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2571,7 +2571,7 @@
    "referenced_type" : "type-187",
    "self_type" : "type-189",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2580,7 +2580,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-168",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2589,7 +2589,7 @@
    "referenced_type" : "type-165",
    "self_type" : "type-166",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2598,7 +2598,7 @@
    "referenced_type" : "type-204",
    "self_type" : "type-205",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2607,7 +2607,7 @@
    "referenced_type" : "type-206",
    "self_type" : "type-207",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2616,7 +2616,7 @@
    "referenced_type" : "type-190",
    "self_type" : "type-191",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2625,7 +2625,7 @@
    "referenced_type" : "type-192",
    "self_type" : "type-193",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2634,7 +2634,7 @@
    "referenced_type" : "type-122",
    "self_type" : "type-128",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2643,7 +2643,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-43",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2652,7 +2652,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-28",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2661,7 +2661,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-57",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -2670,7 +2670,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-49",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2679,7 +2679,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-202",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -2688,7 +2688,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-198",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2697,7 +2697,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-33",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2706,7 +2706,7 @@
    "referenced_type" : "type-33",
    "self_type" : "type-32",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2715,7 +2715,7 @@
    "referenced_type" : "type-158",
    "self_type" : "type-160",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -2724,7 +2724,7 @@
    "referenced_type" : "type-137",
    "self_type" : "type-141",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2733,7 +2733,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-209",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -2742,7 +2742,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-18",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2751,7 +2751,7 @@
    "referenced_type" : "type-24",
    "self_type" : "type-38",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2760,7 +2760,7 @@
    "referenced_type" : "type-196",
    "self_type" : "type-195",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2769,7 +2769,7 @@
    "referenced_type" : "type-110",
    "self_type" : "type-109",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2778,7 +2778,7 @@
    "referenced_type" : "type-118",
    "self_type" : "type-131",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2787,7 +2787,7 @@
    "referenced_type" : "type-13",
    "self_type" : "type-12",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2796,7 +2796,7 @@
    "referenced_type" : "type-176",
    "self_type" : "type-178",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2805,7 +2805,7 @@
    "referenced_type" : "type-212",
    "self_type" : "type-214",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2814,7 +2814,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-52",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2823,7 +2823,7 @@
    "referenced_type" : "type-98",
    "self_type" : "type-100",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2832,7 +2832,7 @@
    "referenced_type" : "type-184",
    "self_type" : "type-183",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2841,7 +2841,7 @@
    "referenced_type" : "type-68",
    "self_type" : "type-78",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -2850,7 +2850,7 @@
    "referenced_type" : "type-8",
    "self_type" : "type-53",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -2859,7 +2859,7 @@
    "referenced_type" : "type-56",
    "self_type" : "type-77",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -2868,7 +2868,7 @@
    "referenced_type" : "type-73",
    "self_type" : "type-76",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -2877,7 +2877,7 @@
    "referenced_type" : "type-197",
    "self_type" : "type-201",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2886,7 +2886,7 @@
    "referenced_type" : "type-104",
    "self_type" : "type-103",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -2895,7 +2895,7 @@
    "referenced_type" : "type-136",
    "self_type" : "type-135",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 8,
@@ -2904,7 +2904,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-142",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "alignment" : 8,
@@ -2913,7 +2913,7 @@
    "referenced_type" : "type-222",
    "self_type" : "type-221",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -2922,7 +2922,7 @@
    "referenced_type" : "type-62",
    "self_type" : "type-61",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 8,
@@ -2931,7 +2931,7 @@
    "referenced_type" : "type-90",
    "self_type" : "type-89",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -2940,7 +2940,7 @@
    "referenced_type" : "type-97",
    "self_type" : "type-96",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -2949,7 +2949,7 @@
    "referenced_type" : "type-185",
    "self_type" : "type-188",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2958,7 +2958,7 @@
    "referenced_type" : "type-31",
    "self_type" : "type-71",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -2967,7 +2967,7 @@
    "referenced_type" : "type-55",
    "self_type" : "type-72",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -2976,7 +2976,7 @@
    "referenced_type" : "type-63",
    "self_type" : "type-70",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -2985,7 +2985,7 @@
    "referenced_type" : "type-69",
    "self_type" : "type-170",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   }
  ],
  "qualified_types" :
@@ -2998,7 +2998,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-158",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -3008,7 +3008,7 @@
    "referenced_type" : "type-122",
    "self_type" : "type-137",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3018,7 +3018,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-65",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -3028,7 +3028,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-15",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -3038,7 +3038,7 @@
    "referenced_type" : "type-11",
    "self_type" : "type-149",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -3048,7 +3048,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-24",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -3058,7 +3058,7 @@
    "referenced_type" : "type-8",
    "self_type" : "type-123",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -3068,7 +3068,7 @@
    "referenced_type" : "type-197",
    "self_type" : "type-196",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3078,7 +3078,7 @@
    "referenced_type" : "type-111",
    "self_type" : "type-110",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -3088,7 +3088,7 @@
    "referenced_type" : "type-119",
    "self_type" : "type-118",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3098,7 +3098,7 @@
    "referenced_type" : "type-133",
    "self_type" : "type-132",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 8,
@@ -3108,7 +3108,7 @@
    "referenced_type" : "type-139",
    "self_type" : "type-138",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -3118,7 +3118,7 @@
    "referenced_type" : "type-145",
    "self_type" : "type-144",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -3128,7 +3128,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -3138,7 +3138,7 @@
    "referenced_type" : "type-177",
    "self_type" : "type-176",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3148,7 +3148,7 @@
    "referenced_type" : "type-213",
    "self_type" : "type-212",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3158,7 +3158,7 @@
    "referenced_type" : "type-27",
    "self_type" : "type-26",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3168,7 +3168,7 @@
    "referenced_type" : "type-59",
    "self_type" : "type-58",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 8,
@@ -3178,7 +3178,7 @@
    "referenced_type" : "type-75",
    "self_type" : "type-74",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -3188,7 +3188,7 @@
    "referenced_type" : "type-99",
    "self_type" : "type-98",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3198,7 +3198,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-105",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3208,7 +3208,7 @@
    "referenced_type" : "type-127",
    "self_type" : "type-126",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3218,7 +3218,7 @@
    "referenced_type" : "type-172",
    "self_type" : "type-171",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3228,7 +3228,7 @@
    "referenced_type" : "type-3",
    "self_type" : "type-2",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3238,7 +3238,7 @@
    "referenced_type" : "type-42",
    "self_type" : "type-41",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3248,7 +3248,7 @@
    "referenced_type" : "type-46",
    "self_type" : "type-45",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3258,7 +3258,7 @@
    "referenced_type" : "type-93",
    "self_type" : "type-92",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3268,7 +3268,7 @@
    "referenced_type" : "type-152",
    "self_type" : "type-151",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -3278,7 +3278,7 @@
    "referenced_type" : "type-85",
    "self_type" : "type-84",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -3288,7 +3288,7 @@
    "referenced_type" : "type-88",
    "self_type" : "type-87",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -3298,7 +3298,7 @@
    "referenced_type" : "type-148",
    "self_type" : "type-147",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 1,
@@ -3308,7 +3308,7 @@
    "referenced_type" : "type-185",
    "self_type" : "type-184",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -3316,7 +3316,7 @@
    "name" : "const void",
    "referenced_type" : "type-69",
    "self_type" : "type-68",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   }
  ],
  "record_types" :
@@ -3349,7 +3349,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-156",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS13CapturedStdFd"
   },
   {
@@ -3366,7 +3366,7 @@
    "referenced_type" : "type-161",
    "self_type" : "type-161",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS14CapturedStderr"
   },
   {
@@ -3383,7 +3383,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-163",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS14CapturedStdout"
   },
   {
@@ -3407,7 +3407,7 @@
    "referenced_type" : "type-219",
    "self_type" : "type-219",
    "size" : 1025,
-   "source_file" : "/system/core/base/include/android-base/file.h",
+   "source_file" : "/system/libbase/include/android-base/file.h",
    "unique_id" : "_ZTS12TemporaryDir"
   },
   {
@@ -3436,7 +3436,7 @@
    "referenced_type" : "type-7",
    "self_type" : "type-7",
    "size" : 1032,
-   "source_file" : "/system/core/base/include/android-base/file.h",
+   "source_file" : "/system/libbase/include/android-base/file.h",
    "unique_id" : "_ZTS13TemporaryFile"
   },
   {
@@ -3446,7 +3446,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-17",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -3468,7 +3468,7 @@
    "referenced_type" : "type-180",
    "self_type" : "type-180",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-33", "type-33" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
   },
@@ -3491,7 +3491,7 @@
    "referenced_type" : "type-175",
    "self_type" : "type-175",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-33", "type-38" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
   },
@@ -3514,7 +3514,7 @@
    "referenced_type" : "type-159",
    "self_type" : "type-159",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-38", "type-33" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
   },
@@ -3537,7 +3537,7 @@
    "referenced_type" : "type-154",
    "self_type" : "type-154",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-38", "type-38" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
   },
@@ -3560,7 +3560,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-194",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-195", "type-195" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
@@ -3583,7 +3583,7 @@
    "referenced_type" : "type-200",
    "self_type" : "type-200",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-195", "type-201" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
@@ -3606,7 +3606,7 @@
    "referenced_type" : "type-182",
    "self_type" : "type-182",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-183", "type-183" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
   },
@@ -3629,7 +3629,7 @@
    "referenced_type" : "type-187",
    "self_type" : "type-187",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-183", "type-188" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
   },
@@ -3652,7 +3652,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-167",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-8", "type-8" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIiiEE"
   },
@@ -3675,7 +3675,7 @@
    "referenced_type" : "type-165",
    "self_type" : "type-165",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-8", "type-56" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIilEE"
   },
@@ -3698,7 +3698,7 @@
    "referenced_type" : "type-204",
    "self_type" : "type-204",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-201", "type-195" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
@@ -3721,7 +3721,7 @@
    "referenced_type" : "type-206",
    "self_type" : "type-206",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-201", "type-201" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
@@ -3744,7 +3744,7 @@
    "referenced_type" : "type-190",
    "self_type" : "type-190",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-188", "type-183" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
   },
@@ -3767,7 +3767,7 @@
    "referenced_type" : "type-192",
    "self_type" : "type-192",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-188", "type-188" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
   },
@@ -3787,7 +3787,7 @@
    "referenced_type" : "type-122",
    "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
   },
   {
@@ -3806,7 +3806,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-44",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
   },
   {
@@ -3825,7 +3825,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-29",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
   },
   {
@@ -3856,7 +3856,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-54",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h",
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h",
    "unique_id" : "_ZTSN7android4base10MappedFileE"
   },
   {
@@ -3875,7 +3875,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-50",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
   },
   {
@@ -3894,7 +3894,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-66",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h",
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h",
    "unique_id" : "_ZTSN7android4base5TimerE"
   },
   {
@@ -3905,7 +3905,7 @@
    "referenced_type" : "type-1",
    "self_type" : "type-1",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h",
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h",
    "unique_id" : "_ZTSN7android4base10boot_clockE"
   },
   {
@@ -3924,7 +3924,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-16",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "template_args" : [ "type-17" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   }
@@ -3938,7 +3938,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-208",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -3947,7 +3947,7 @@
    "referenced_type" : "type-121",
    "self_type" : "type-120",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3956,7 +3956,7 @@
    "referenced_type" : "type-35",
    "self_type" : "type-34",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3965,7 +3965,7 @@
    "referenced_type" : "type-125",
    "self_type" : "type-124",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3974,7 +3974,7 @@
    "referenced_type" : "type-37",
    "self_type" : "type-36",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   }
  ]
 }
diff --git a/29/64/arm_armv7-a-neon/source-based/libbase.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libbase.so.lsdump
index d71e3731..dbbc0c59 100644
--- a/29/64/arm_armv7-a-neon/source-based/libbase.so.lsdump
+++ b/29/64/arm_armv7-a-neon/source-based/libbase.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-9",
    "size" : 1024,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   }
  ],
  "builtin_types" :
@@ -674,7 +674,7 @@
    "referenced_type" : "type-30",
    "self_type" : "type-30",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "type-31",
    "unique_id" : "_ZTSN7android4base5LogIdE"
   },
@@ -716,7 +716,7 @@
    "referenced_type" : "type-51",
    "self_type" : "type-51",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "type-31",
    "unique_id" : "_ZTSN7android4base11LogSeverityE"
   }
@@ -739,7 +739,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -752,7 +752,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -765,7 +765,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -778,7 +778,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -791,7 +791,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "CapturedStdFd::str",
@@ -804,7 +804,7 @@
     }
    ],
    "return_type" : "type-227",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Stop",
@@ -817,7 +817,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Reset",
@@ -830,7 +830,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Start",
@@ -843,7 +843,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -859,7 +859,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -875,7 +875,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -888,7 +888,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -901,7 +901,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "access" : "private",
@@ -918,7 +918,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::release",
@@ -931,7 +931,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -947,7 +947,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -960,7 +960,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -976,7 +976,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -989,7 +989,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -1002,7 +1002,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -1015,7 +1015,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::LogMessage::stream",
@@ -1028,7 +1028,7 @@
     }
    ],
    "return_type" : "type-47",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogLine",
@@ -1055,7 +1055,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -1086,7 +1086,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -1117,7 +1117,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -1130,7 +1130,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -1143,7 +1143,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -1160,7 +1160,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -1177,7 +1177,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::operator()",
@@ -1208,7 +1208,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromFd",
@@ -1229,7 +1229,7 @@
     }
    ],
    "return_type" : "type-228",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -1242,7 +1242,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -1255,7 +1255,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::SetAborter",
@@ -1267,7 +1267,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -1282,7 +1282,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -1297,7 +1297,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::WriteFully",
@@ -1315,13 +1315,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::boot_clock::now",
    "linker_set_key" : "_ZN7android4base10boot_clock3nowEv",
    "return_type" : "type-232",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "function_name" : "android::base::GetProperty",
@@ -1336,13 +1336,13 @@
     }
    ],
    "return_type" : "type-233",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::GetThreadId",
    "linker_set_key" : "_ZN7android4base11GetThreadIdEv",
    "return_type" : "type-71",
-   "source_file" : "/system/core/base/include/android-base/threads.h"
+   "source_file" : "/system/libbase/include/android-base/threads.h"
   },
   {
    "function_name" : "android::base::InitLogging",
@@ -1362,7 +1362,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetProperty",
@@ -1377,7 +1377,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::StdioLogger",
@@ -1404,7 +1404,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::KernelLogger",
@@ -1431,7 +1431,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StderrLogger",
@@ -1458,7 +1458,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringPrintf",
@@ -1470,13 +1470,13 @@
     }
    ],
    "return_type" : "type-234",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::GetDefaultTag",
    "linker_set_key" : "_ZN7android4base13GetDefaultTagEv",
    "return_type" : "type-235",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetDefaultTag",
@@ -1488,7 +1488,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringAppendF",
@@ -1503,7 +1503,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringAppendV",
@@ -1521,7 +1521,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::DefaultAborter",
@@ -1533,7 +1533,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ReadFdToString",
@@ -1548,7 +1548,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetBoolProperty",
@@ -1563,7 +1563,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::ParseNetAddress",
@@ -1587,7 +1587,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "function_name" : "android::base::WaitForProperty",
@@ -1606,7 +1606,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::WriteStringToFd",
@@ -1621,7 +1621,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EqualsIgnoreCase",
@@ -1636,7 +1636,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::ReadFileToString",
@@ -1655,13 +1655,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetExecutablePath",
    "linker_set_key" : "_ZN7android4base17GetExecutablePathEv",
    "return_type" : "type-240",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ReadFullyAtOffset",
@@ -1682,7 +1682,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -1698,7 +1698,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -1714,7 +1714,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -1727,7 +1727,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -1740,7 +1740,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -1759,7 +1759,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -1787,7 +1787,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWithIgnoreCase",
@@ -1802,7 +1802,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::RemoveFileIfExists",
@@ -1818,7 +1818,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::StartsWithIgnoreCase",
@@ -1833,13 +1833,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::GetMinimumLogSeverity",
    "linker_set_key" : "_ZN7android4base21GetMinimumLogSeverityEv",
    "return_type" : "type-51",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetMinimumLogSeverity",
@@ -1851,13 +1851,13 @@
     }
    ],
    "return_type" : "type-51",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::GetExecutableDirectory",
    "linker_set_key" : "_ZN7android4base22GetExecutableDirectoryEv",
    "return_type" : "type-245",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SystemErrorCodeToString",
@@ -1869,7 +1869,7 @@
     }
    ],
    "return_type" : "type-246",
-   "source_file" : "/system/core/base/include/android-base/errors.h"
+   "source_file" : "/system/libbase/include/android-base/errors.h"
   },
   {
    "function_name" : "android::base::WaitForPropertyCreation",
@@ -1885,7 +1885,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::SendFileDescriptorVector",
@@ -1906,7 +1906,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::ReceiveFileDescriptorVector",
@@ -1930,7 +1930,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::Join",
@@ -1945,7 +1945,7 @@
     }
    ],
    "return_type" : "type-248",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-249", "type-148" ]
   },
   {
@@ -1961,7 +1961,7 @@
     }
    ],
    "return_type" : "type-250",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-251", "type-10" ]
   },
   {
@@ -1977,7 +1977,7 @@
     }
    ],
    "return_type" : "type-252",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-253", "type-148" ]
   },
   {
@@ -1993,7 +1993,7 @@
     }
    ],
    "return_type" : "type-254",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-255", "type-10" ]
   },
   {
@@ -2006,7 +2006,7 @@
     }
    ],
    "return_type" : "type-256",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Split",
@@ -2021,7 +2021,7 @@
     }
    ],
    "return_type" : "type-257",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Dirname",
@@ -2033,7 +2033,7 @@
     }
    ],
    "return_type" : "type-258",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Basename",
@@ -2045,7 +2045,7 @@
     }
    ],
    "return_type" : "type-259",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -2060,7 +2060,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -2075,7 +2075,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Readlink",
@@ -2090,7 +2090,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Realpath",
@@ -2105,7 +2105,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ParseUint",
@@ -2128,7 +2128,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-189" ]
   },
   {
@@ -2152,7 +2152,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-31" ]
   },
   {
@@ -2176,7 +2176,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-64" ]
   },
   {
@@ -2200,7 +2200,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-71" ]
   },
   {
@@ -2219,7 +2219,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SetLogger",
@@ -2231,7 +2231,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::operator<<",
@@ -2246,7 +2246,7 @@
     }
    ],
    "return_type" : "type-223",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -2260,7 +2260,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   }
  ],
  "global_vars" : [],
@@ -2273,7 +2273,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-65",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2282,7 +2282,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-118",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2291,7 +2291,7 @@
    "referenced_type" : "type-120",
    "self_type" : "type-119",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2300,7 +2300,7 @@
    "referenced_type" : "type-13",
    "self_type" : "type-23",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2309,7 +2309,7 @@
    "referenced_type" : "type-134",
    "self_type" : "type-136",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2318,7 +2318,7 @@
    "referenced_type" : "type-140",
    "self_type" : "type-142",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -2327,7 +2327,7 @@
    "referenced_type" : "type-146",
    "self_type" : "type-148",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2336,7 +2336,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2345,7 +2345,7 @@
    "referenced_type" : "type-270",
    "self_type" : "type-278",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2354,7 +2354,7 @@
    "referenced_type" : "type-281",
    "self_type" : "type-280",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2363,7 +2363,7 @@
    "referenced_type" : "type-302",
    "self_type" : "type-304",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2372,7 +2372,7 @@
    "referenced_type" : "type-312",
    "self_type" : "type-316",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -2381,7 +2381,7 @@
    "referenced_type" : "type-321",
    "self_type" : "type-323",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2390,7 +2390,7 @@
    "referenced_type" : "type-58",
    "self_type" : "type-60",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2399,7 +2399,7 @@
    "referenced_type" : "type-74",
    "self_type" : "type-79",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -2408,7 +2408,7 @@
    "referenced_type" : "type-153",
    "self_type" : "type-155",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2417,7 +2417,7 @@
    "referenced_type" : "type-327",
    "self_type" : "type-329",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2426,7 +2426,7 @@
    "referenced_type" : "type-319",
    "self_type" : "type-330",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2435,7 +2435,7 @@
    "referenced_type" : "type-82",
    "self_type" : "type-91",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2444,7 +2444,7 @@
    "referenced_type" : "type-86",
    "self_type" : "type-88",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2453,7 +2453,7 @@
    "referenced_type" : "type-149",
    "self_type" : "type-152",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2462,7 +2462,7 @@
    "referenced_type" : "type-324",
    "self_type" : "type-326",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2471,7 +2471,7 @@
    "referenced_type" : "type-108",
    "self_type" : "type-107",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2480,7 +2480,7 @@
    "referenced_type" : "type-131",
    "self_type" : "type-130",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2489,7 +2489,7 @@
    "referenced_type" : "type-176",
    "self_type" : "type-175",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2498,7 +2498,7 @@
    "referenced_type" : "type-214",
    "self_type" : "type-213",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2507,7 +2507,7 @@
    "referenced_type" : "type-224",
    "self_type" : "type-223",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2516,7 +2516,7 @@
    "referenced_type" : "type-267",
    "self_type" : "type-266",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2525,7 +2525,7 @@
    "referenced_type" : "type-296",
    "self_type" : "type-295",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2534,7 +2534,7 @@
    "referenced_type" : "type-343",
    "self_type" : "type-342",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2543,7 +2543,7 @@
    "referenced_type" : "type-375",
    "self_type" : "type-374",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2552,7 +2552,7 @@
    "referenced_type" : "type-385",
    "self_type" : "type-384",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2561,7 +2561,7 @@
    "referenced_type" : "type-48",
    "self_type" : "type-47",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2570,7 +2570,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-4",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2579,7 +2579,7 @@
    "referenced_type" : "type-81",
    "self_type" : "type-80",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2588,7 +2588,7 @@
    "referenced_type" : "type-97",
    "self_type" : "type-96",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   }
  ],
  "pointer_types" :
@@ -2600,7 +2600,7 @@
    "referenced_type" : "type-157",
    "self_type" : "type-158",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2609,7 +2609,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-163",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2618,7 +2618,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-165",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2627,7 +2627,7 @@
    "referenced_type" : "type-117",
    "self_type" : "type-116",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2636,7 +2636,7 @@
    "referenced_type" : "type-22",
    "self_type" : "type-21",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2645,7 +2645,7 @@
    "referenced_type" : "type-277",
    "self_type" : "type-276",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2654,7 +2654,7 @@
    "referenced_type" : "type-291",
    "self_type" : "type-290",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2663,7 +2663,7 @@
    "referenced_type" : "type-40",
    "self_type" : "type-39",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2672,7 +2672,7 @@
    "referenced_type" : "type-85",
    "self_type" : "type-84",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2681,7 +2681,7 @@
    "referenced_type" : "type-221",
    "self_type" : "type-222",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2690,7 +2690,7 @@
    "referenced_type" : "type-7",
    "self_type" : "type-6",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2699,7 +2699,7 @@
    "referenced_type" : "type-102",
    "self_type" : "type-101",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2708,7 +2708,7 @@
    "referenced_type" : "type-115",
    "self_type" : "type-114",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2717,7 +2717,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-19",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2726,7 +2726,7 @@
    "referenced_type" : "type-220",
    "self_type" : "type-219",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2735,7 +2735,7 @@
    "referenced_type" : "type-275",
    "self_type" : "type-274",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2744,7 +2744,7 @@
    "referenced_type" : "type-381",
    "self_type" : "type-380",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2753,7 +2753,7 @@
    "referenced_type" : "type-177",
    "self_type" : "type-185",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2762,7 +2762,7 @@
    "referenced_type" : "type-166",
    "self_type" : "type-171",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2771,7 +2771,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-160",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2780,7 +2780,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-151",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2789,7 +2789,7 @@
    "referenced_type" : "type-198",
    "self_type" : "type-202",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2798,7 +2798,7 @@
    "referenced_type" : "type-203",
    "self_type" : "type-206",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2807,7 +2807,7 @@
    "referenced_type" : "type-186",
    "self_type" : "type-190",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2816,7 +2816,7 @@
    "referenced_type" : "type-191",
    "self_type" : "type-193",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2825,7 +2825,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-170",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2834,7 +2834,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-168",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2843,7 +2843,7 @@
    "referenced_type" : "type-208",
    "self_type" : "type-209",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2852,7 +2852,7 @@
    "referenced_type" : "type-210",
    "self_type" : "type-211",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2861,7 +2861,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-195",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2870,7 +2870,7 @@
    "referenced_type" : "type-196",
    "self_type" : "type-197",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2879,7 +2879,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-126",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2888,7 +2888,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-43",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2897,7 +2897,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-28",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2906,7 +2906,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-57",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -2915,7 +2915,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-49",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2924,7 +2924,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-207",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2933,7 +2933,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-205",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2942,7 +2942,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-33",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2951,7 +2951,7 @@
    "referenced_type" : "type-33",
    "self_type" : "type-32",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2960,7 +2960,7 @@
    "referenced_type" : "type-159",
    "self_type" : "type-161",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2969,7 +2969,7 @@
    "referenced_type" : "type-129",
    "self_type" : "type-133",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2978,7 +2978,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-215",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2987,7 +2987,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-18",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2996,7 +2996,7 @@
    "referenced_type" : "type-24",
    "self_type" : "type-38",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -3005,7 +3005,7 @@
    "referenced_type" : "type-200",
    "self_type" : "type-199",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3014,7 +3014,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-111",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3023,7 +3023,7 @@
    "referenced_type" : "type-120",
    "self_type" : "type-132",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3032,7 +3032,7 @@
    "referenced_type" : "type-13",
    "self_type" : "type-12",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3041,7 +3041,7 @@
    "referenced_type" : "type-178",
    "self_type" : "type-180",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3050,7 +3050,7 @@
    "referenced_type" : "type-216",
    "self_type" : "type-218",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3059,7 +3059,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-52",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3068,7 +3068,7 @@
    "referenced_type" : "type-270",
    "self_type" : "type-269",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3077,7 +3077,7 @@
    "referenced_type" : "type-281",
    "self_type" : "type-298",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3086,7 +3086,7 @@
    "referenced_type" : "type-344",
    "self_type" : "type-346",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3095,7 +3095,7 @@
    "referenced_type" : "type-377",
    "self_type" : "type-379",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3104,7 +3104,7 @@
    "referenced_type" : "type-98",
    "self_type" : "type-100",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3113,7 +3113,7 @@
    "referenced_type" : "type-188",
    "self_type" : "type-187",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3122,7 +3122,7 @@
    "referenced_type" : "type-55",
    "self_type" : "type-69",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3131,7 +3131,7 @@
    "referenced_type" : "type-8",
    "self_type" : "type-53",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3140,7 +3140,7 @@
    "referenced_type" : "type-78",
    "self_type" : "type-77",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3149,7 +3149,7 @@
    "referenced_type" : "type-73",
    "self_type" : "type-76",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3158,7 +3158,7 @@
    "referenced_type" : "type-201",
    "self_type" : "type-204",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3167,7 +3167,7 @@
    "referenced_type" : "type-104",
    "self_type" : "type-103",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3176,7 +3176,7 @@
    "referenced_type" : "type-138",
    "self_type" : "type-137",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3185,7 +3185,7 @@
    "referenced_type" : "type-145",
    "self_type" : "type-144",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "alignment" : 4,
@@ -3194,7 +3194,7 @@
    "referenced_type" : "type-226",
    "self_type" : "type-225",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3203,7 +3203,7 @@
    "referenced_type" : "type-306",
    "self_type" : "type-305",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3212,7 +3212,7 @@
    "referenced_type" : "type-318",
    "self_type" : "type-317",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "alignment" : 4,
@@ -3221,7 +3221,7 @@
    "referenced_type" : "type-387",
    "self_type" : "type-386",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3230,7 +3230,7 @@
    "referenced_type" : "type-62",
    "self_type" : "type-61",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3239,7 +3239,7 @@
    "referenced_type" : "type-332",
    "self_type" : "type-331",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3248,7 +3248,7 @@
    "referenced_type" : "type-90",
    "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3257,7 +3257,7 @@
    "referenced_type" : "type-93",
    "self_type" : "type-92",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3266,7 +3266,7 @@
    "referenced_type" : "type-189",
    "self_type" : "type-192",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3275,7 +3275,7 @@
    "referenced_type" : "type-31",
    "self_type" : "type-70",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3284,7 +3284,7 @@
    "referenced_type" : "type-71",
    "self_type" : "type-72",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3293,7 +3293,7 @@
    "referenced_type" : "type-64",
    "self_type" : "type-63",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3302,7 +3302,7 @@
    "referenced_type" : "type-56",
    "self_type" : "type-172",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   }
  ],
  "qualified_types" :
@@ -3315,7 +3315,7 @@
    "referenced_type" : "type-157",
    "self_type" : "type-159",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -3325,7 +3325,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-129",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3335,7 +3335,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-66",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -3345,7 +3345,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-15",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -3355,7 +3355,7 @@
    "referenced_type" : "type-11",
    "self_type" : "type-139",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -3365,7 +3365,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-24",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -3375,7 +3375,7 @@
    "referenced_type" : "type-8",
    "self_type" : "type-110",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -3385,7 +3385,7 @@
    "referenced_type" : "type-201",
    "self_type" : "type-200",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3395,7 +3395,7 @@
    "referenced_type" : "type-113",
    "self_type" : "type-112",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3405,7 +3405,7 @@
    "referenced_type" : "type-121",
    "self_type" : "type-120",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3415,7 +3415,7 @@
    "referenced_type" : "type-135",
    "self_type" : "type-134",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3425,7 +3425,7 @@
    "referenced_type" : "type-141",
    "self_type" : "type-140",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -3435,7 +3435,7 @@
    "referenced_type" : "type-147",
    "self_type" : "type-146",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3445,7 +3445,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3455,7 +3455,7 @@
    "referenced_type" : "type-179",
    "self_type" : "type-178",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3465,7 +3465,7 @@
    "referenced_type" : "type-217",
    "self_type" : "type-216",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3475,7 +3475,7 @@
    "referenced_type" : "type-271",
    "self_type" : "type-270",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3485,7 +3485,7 @@
    "referenced_type" : "type-27",
    "self_type" : "type-26",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3495,7 +3495,7 @@
    "referenced_type" : "type-282",
    "self_type" : "type-281",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3505,7 +3505,7 @@
    "referenced_type" : "type-303",
    "self_type" : "type-302",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3515,7 +3515,7 @@
    "referenced_type" : "type-313",
    "self_type" : "type-312",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -3525,7 +3525,7 @@
    "referenced_type" : "type-322",
    "self_type" : "type-321",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3535,7 +3535,7 @@
    "referenced_type" : "type-345",
    "self_type" : "type-344",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3545,7 +3545,7 @@
    "referenced_type" : "type-378",
    "self_type" : "type-377",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3555,7 +3555,7 @@
    "referenced_type" : "type-59",
    "self_type" : "type-58",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3565,7 +3565,7 @@
    "referenced_type" : "type-75",
    "self_type" : "type-74",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -3575,7 +3575,7 @@
    "referenced_type" : "type-99",
    "self_type" : "type-98",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3585,7 +3585,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-105",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3595,7 +3595,7 @@
    "referenced_type" : "type-128",
    "self_type" : "type-127",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3605,7 +3605,7 @@
    "referenced_type" : "type-174",
    "self_type" : "type-173",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3615,7 +3615,7 @@
    "referenced_type" : "type-265",
    "self_type" : "type-264",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3625,7 +3625,7 @@
    "referenced_type" : "type-293",
    "self_type" : "type-292",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3635,7 +3635,7 @@
    "referenced_type" : "type-341",
    "self_type" : "type-340",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3645,7 +3645,7 @@
    "referenced_type" : "type-372",
    "self_type" : "type-371",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3655,7 +3655,7 @@
    "referenced_type" : "type-3",
    "self_type" : "type-2",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3665,7 +3665,7 @@
    "referenced_type" : "type-42",
    "self_type" : "type-41",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3675,7 +3675,7 @@
    "referenced_type" : "type-46",
    "self_type" : "type-45",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3685,7 +3685,7 @@
    "referenced_type" : "type-95",
    "self_type" : "type-94",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3695,7 +3695,7 @@
    "referenced_type" : "type-154",
    "self_type" : "type-153",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3705,7 +3705,7 @@
    "referenced_type" : "type-328",
    "self_type" : "type-327",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3715,7 +3715,7 @@
    "referenced_type" : "type-320",
    "self_type" : "type-319",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3725,7 +3725,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-82",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3735,7 +3735,7 @@
    "referenced_type" : "type-87",
    "self_type" : "type-86",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3745,7 +3745,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-149",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3755,7 +3755,7 @@
    "referenced_type" : "type-325",
    "self_type" : "type-324",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 1,
@@ -3765,7 +3765,7 @@
    "referenced_type" : "type-189",
    "self_type" : "type-188",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -3773,7 +3773,7 @@
    "name" : "const void",
    "referenced_type" : "type-56",
    "self_type" : "type-55",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   }
  ],
  "record_types" :
@@ -3806,7 +3806,7 @@
    "referenced_type" : "type-157",
    "self_type" : "type-157",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS13CapturedStdFd"
   },
   {
@@ -3823,7 +3823,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-162",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS14CapturedStderr"
   },
   {
@@ -3840,7 +3840,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-164",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS14CapturedStdout"
   },
   {
@@ -3864,7 +3864,7 @@
    "referenced_type" : "type-221",
    "self_type" : "type-221",
    "size" : 1025,
-   "source_file" : "/system/core/base/include/android-base/file.h",
+   "source_file" : "/system/libbase/include/android-base/file.h",
    "unique_id" : "_ZTS12TemporaryDir"
   },
   {
@@ -3893,7 +3893,7 @@
    "referenced_type" : "type-7",
    "self_type" : "type-7",
    "size" : 1032,
-   "source_file" : "/system/core/base/include/android-base/file.h",
+   "source_file" : "/system/libbase/include/android-base/file.h",
    "unique_id" : "_ZTS13TemporaryFile"
   },
   {
@@ -3903,7 +3903,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-17",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -3925,7 +3925,7 @@
    "referenced_type" : "type-177",
    "self_type" : "type-177",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-33", "type-33" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
   },
@@ -3948,7 +3948,7 @@
    "referenced_type" : "type-166",
    "self_type" : "type-166",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-33", "type-38" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
   },
@@ -3971,7 +3971,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-156",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-38", "type-33" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
   },
@@ -3994,7 +3994,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-143",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-38", "type-38" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
   },
@@ -4017,7 +4017,7 @@
    "referenced_type" : "type-198",
    "self_type" : "type-198",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-199", "type-199" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
@@ -4040,7 +4040,7 @@
    "referenced_type" : "type-203",
    "self_type" : "type-203",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-199", "type-204" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
@@ -4063,7 +4063,7 @@
    "referenced_type" : "type-186",
    "self_type" : "type-186",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-187", "type-187" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
   },
@@ -4086,7 +4086,7 @@
    "referenced_type" : "type-191",
    "self_type" : "type-191",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-187", "type-192" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
   },
@@ -4109,7 +4109,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-169",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-8", "type-8" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIiiEE"
   },
@@ -4132,7 +4132,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-167",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-8", "type-78" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIixEE"
   },
@@ -4155,7 +4155,7 @@
    "referenced_type" : "type-208",
    "self_type" : "type-208",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-204", "type-199" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
@@ -4178,7 +4178,7 @@
    "referenced_type" : "type-210",
    "self_type" : "type-210",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-204", "type-204" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
@@ -4201,7 +4201,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-194",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-192", "type-187" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
   },
@@ -4224,7 +4224,7 @@
    "referenced_type" : "type-196",
    "self_type" : "type-196",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-192", "type-192" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
   },
@@ -4244,7 +4244,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-109",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
   },
   {
@@ -4263,7 +4263,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-44",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
   },
   {
@@ -4282,7 +4282,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-29",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
   },
   {
@@ -4313,7 +4313,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-54",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h",
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h",
    "unique_id" : "_ZTSN7android4base10MappedFileE"
   },
   {
@@ -4332,7 +4332,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-50",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
   },
   {
@@ -4351,7 +4351,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-67",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h",
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h",
    "unique_id" : "_ZTSN7android4base5TimerE"
   },
   {
@@ -4362,7 +4362,7 @@
    "referenced_type" : "type-1",
    "self_type" : "type-1",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h",
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h",
    "unique_id" : "_ZTSN7android4base10boot_clockE"
   },
   {
@@ -4381,7 +4381,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-16",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "template_args" : [ "type-17" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   }
@@ -4395,7 +4395,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-212",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -4404,7 +4404,7 @@
    "referenced_type" : "type-123",
    "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -4413,7 +4413,7 @@
    "referenced_type" : "type-286",
    "self_type" : "type-285",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -4422,7 +4422,7 @@
    "referenced_type" : "type-35",
    "self_type" : "type-34",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -4431,7 +4431,7 @@
    "referenced_type" : "type-125",
    "self_type" : "type-124",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -4440,7 +4440,7 @@
    "referenced_type" : "type-288",
    "self_type" : "type-287",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -4449,7 +4449,7 @@
    "referenced_type" : "type-37",
    "self_type" : "type-36",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   }
  ]
 }
diff --git a/29/64/arm_armv8-a/source-based/libbase.so.lsdump b/29/64/arm_armv8-a/source-based/libbase.so.lsdump
index 9a52150a..2c8ea777 100644
--- a/29/64/arm_armv8-a/source-based/libbase.so.lsdump
+++ b/29/64/arm_armv8-a/source-based/libbase.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-9",
    "size" : 1024,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   }
  ],
  "builtin_types" :
@@ -674,7 +674,7 @@
    "referenced_type" : "type-30",
    "self_type" : "type-30",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "type-31",
    "unique_id" : "_ZTSN7android4base5LogIdE"
   },
@@ -716,7 +716,7 @@
    "referenced_type" : "type-51",
    "self_type" : "type-51",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "type-31",
    "unique_id" : "_ZTSN7android4base11LogSeverityE"
   }
@@ -739,7 +739,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -752,7 +752,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -765,7 +765,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -778,7 +778,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -791,7 +791,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "CapturedStdFd::str",
@@ -804,7 +804,7 @@
     }
    ],
    "return_type" : "type-175",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Stop",
@@ -817,7 +817,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Reset",
@@ -830,7 +830,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Start",
@@ -843,7 +843,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -859,7 +859,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -875,7 +875,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -888,7 +888,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -901,7 +901,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "access" : "private",
@@ -918,7 +918,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::release",
@@ -931,7 +931,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -947,7 +947,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -960,7 +960,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -976,7 +976,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -989,7 +989,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -1002,7 +1002,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -1015,7 +1015,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::LogMessage::stream",
@@ -1028,7 +1028,7 @@
     }
    ],
    "return_type" : "type-47",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogLine",
@@ -1055,7 +1055,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -1086,7 +1086,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -1117,7 +1117,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -1130,7 +1130,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -1143,7 +1143,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -1160,7 +1160,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -1177,7 +1177,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::operator()",
@@ -1208,7 +1208,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromFd",
@@ -1229,7 +1229,7 @@
     }
    ],
    "return_type" : "type-176",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -1242,7 +1242,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -1255,7 +1255,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::SetAborter",
@@ -1267,7 +1267,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -1282,7 +1282,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -1297,7 +1297,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::WriteFully",
@@ -1315,13 +1315,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::boot_clock::now",
    "linker_set_key" : "_ZN7android4base10boot_clock3nowEv",
    "return_type" : "type-180",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "function_name" : "android::base::GetProperty",
@@ -1336,13 +1336,13 @@
     }
    ],
    "return_type" : "type-181",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::GetThreadId",
    "linker_set_key" : "_ZN7android4base11GetThreadIdEv",
    "return_type" : "type-71",
-   "source_file" : "/system/core/base/include/android-base/threads.h"
+   "source_file" : "/system/libbase/include/android-base/threads.h"
   },
   {
    "function_name" : "android::base::InitLogging",
@@ -1362,7 +1362,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetProperty",
@@ -1377,7 +1377,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::StdioLogger",
@@ -1404,7 +1404,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::KernelLogger",
@@ -1431,7 +1431,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StderrLogger",
@@ -1458,7 +1458,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringPrintf",
@@ -1470,13 +1470,13 @@
     }
    ],
    "return_type" : "type-182",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::GetDefaultTag",
    "linker_set_key" : "_ZN7android4base13GetDefaultTagEv",
    "return_type" : "type-183",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetDefaultTag",
@@ -1488,7 +1488,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringAppendF",
@@ -1503,7 +1503,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringAppendV",
@@ -1521,7 +1521,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::DefaultAborter",
@@ -1533,7 +1533,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ReadFdToString",
@@ -1548,7 +1548,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetBoolProperty",
@@ -1563,7 +1563,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::ParseNetAddress",
@@ -1587,7 +1587,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "function_name" : "android::base::WaitForProperty",
@@ -1606,7 +1606,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::WriteStringToFd",
@@ -1621,7 +1621,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EqualsIgnoreCase",
@@ -1636,7 +1636,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::ReadFileToString",
@@ -1655,13 +1655,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetExecutablePath",
    "linker_set_key" : "_ZN7android4base17GetExecutablePathEv",
    "return_type" : "type-188",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ReadFullyAtOffset",
@@ -1682,7 +1682,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -1698,7 +1698,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -1714,7 +1714,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -1727,7 +1727,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -1740,7 +1740,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -1759,7 +1759,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -1787,7 +1787,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWithIgnoreCase",
@@ -1802,7 +1802,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::RemoveFileIfExists",
@@ -1818,7 +1818,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::StartsWithIgnoreCase",
@@ -1833,13 +1833,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::GetMinimumLogSeverity",
    "linker_set_key" : "_ZN7android4base21GetMinimumLogSeverityEv",
    "return_type" : "type-51",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetMinimumLogSeverity",
@@ -1851,13 +1851,13 @@
     }
    ],
    "return_type" : "type-51",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::GetExecutableDirectory",
    "linker_set_key" : "_ZN7android4base22GetExecutableDirectoryEv",
    "return_type" : "type-193",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SystemErrorCodeToString",
@@ -1869,7 +1869,7 @@
     }
    ],
    "return_type" : "type-194",
-   "source_file" : "/system/core/base/include/android-base/errors.h"
+   "source_file" : "/system/libbase/include/android-base/errors.h"
   },
   {
    "function_name" : "android::base::WaitForPropertyCreation",
@@ -1885,7 +1885,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::SendFileDescriptorVector",
@@ -1906,7 +1906,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::ReceiveFileDescriptorVector",
@@ -1930,7 +1930,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::Join",
@@ -1945,7 +1945,7 @@
     }
    ],
    "return_type" : "type-196",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-197", "type-86" ]
   },
   {
@@ -1961,7 +1961,7 @@
     }
    ],
    "return_type" : "type-198",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-199", "type-10" ]
   },
   {
@@ -1977,7 +1977,7 @@
     }
    ],
    "return_type" : "type-200",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-201", "type-86" ]
   },
   {
@@ -1993,7 +1993,7 @@
     }
    ],
    "return_type" : "type-202",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-203", "type-10" ]
   },
   {
@@ -2006,7 +2006,7 @@
     }
    ],
    "return_type" : "type-204",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Split",
@@ -2021,7 +2021,7 @@
     }
    ],
    "return_type" : "type-205",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Dirname",
@@ -2033,7 +2033,7 @@
     }
    ],
    "return_type" : "type-206",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Basename",
@@ -2045,7 +2045,7 @@
     }
    ],
    "return_type" : "type-207",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -2060,7 +2060,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -2075,7 +2075,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Readlink",
@@ -2090,7 +2090,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Realpath",
@@ -2105,7 +2105,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ParseUint",
@@ -2128,7 +2128,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-137" ]
   },
   {
@@ -2152,7 +2152,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-31" ]
   },
   {
@@ -2176,7 +2176,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-64" ]
   },
   {
@@ -2200,7 +2200,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-71" ]
   },
   {
@@ -2219,7 +2219,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SetLogger",
@@ -2231,7 +2231,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::operator<<",
@@ -2246,7 +2246,7 @@
     }
    ],
    "return_type" : "type-171",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -2260,7 +2260,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   }
  ],
  "global_vars" : [],
@@ -2273,7 +2273,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-65",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2282,7 +2282,7 @@
    "referenced_type" : "type-13",
    "self_type" : "type-23",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2291,7 +2291,7 @@
    "referenced_type" : "type-218",
    "self_type" : "type-226",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2300,7 +2300,7 @@
    "referenced_type" : "type-229",
    "self_type" : "type-228",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2309,7 +2309,7 @@
    "referenced_type" : "type-250",
    "self_type" : "type-252",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2318,7 +2318,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2327,7 +2327,7 @@
    "referenced_type" : "type-260",
    "self_type" : "type-264",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -2336,7 +2336,7 @@
    "referenced_type" : "type-295",
    "self_type" : "type-302",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2345,7 +2345,7 @@
    "referenced_type" : "type-304",
    "self_type" : "type-303",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2354,7 +2354,7 @@
    "referenced_type" : "type-318",
    "self_type" : "type-320",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2363,7 +2363,7 @@
    "referenced_type" : "type-324",
    "self_type" : "type-326",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -2372,7 +2372,7 @@
    "referenced_type" : "type-329",
    "self_type" : "type-331",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2381,7 +2381,7 @@
    "referenced_type" : "type-58",
    "self_type" : "type-60",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2390,7 +2390,7 @@
    "referenced_type" : "type-74",
    "self_type" : "type-79",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -2399,7 +2399,7 @@
    "referenced_type" : "type-84",
    "self_type" : "type-86",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2408,7 +2408,7 @@
    "referenced_type" : "type-336",
    "self_type" : "type-338",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2417,7 +2417,7 @@
    "referenced_type" : "type-90",
    "self_type" : "type-92",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2426,7 +2426,7 @@
    "referenced_type" : "type-267",
    "self_type" : "type-276",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2435,7 +2435,7 @@
    "referenced_type" : "type-271",
    "self_type" : "type-273",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2444,7 +2444,7 @@
    "referenced_type" : "type-82",
    "self_type" : "type-93",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2453,7 +2453,7 @@
    "referenced_type" : "type-332",
    "self_type" : "type-335",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2462,7 +2462,7 @@
    "referenced_type" : "type-87",
    "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2471,7 +2471,7 @@
    "referenced_type" : "type-111",
    "self_type" : "type-110",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2480,7 +2480,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-161",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2489,7 +2489,7 @@
    "referenced_type" : "type-172",
    "self_type" : "type-171",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2498,7 +2498,7 @@
    "referenced_type" : "type-215",
    "self_type" : "type-214",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2507,7 +2507,7 @@
    "referenced_type" : "type-244",
    "self_type" : "type-243",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2516,7 +2516,7 @@
    "referenced_type" : "type-266",
    "self_type" : "type-265",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2525,7 +2525,7 @@
    "referenced_type" : "type-282",
    "self_type" : "type-281",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2534,7 +2534,7 @@
    "referenced_type" : "type-293",
    "self_type" : "type-292",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2543,7 +2543,7 @@
    "referenced_type" : "type-315",
    "self_type" : "type-314",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2552,7 +2552,7 @@
    "referenced_type" : "type-352",
    "self_type" : "type-351",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2561,7 +2561,7 @@
    "referenced_type" : "type-375",
    "self_type" : "type-374",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2570,7 +2570,7 @@
    "referenced_type" : "type-385",
    "self_type" : "type-384",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2579,7 +2579,7 @@
    "referenced_type" : "type-48",
    "self_type" : "type-47",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2588,7 +2588,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-4",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   }
  ],
  "pointer_types" :
@@ -2600,7 +2600,7 @@
    "referenced_type" : "type-96",
    "self_type" : "type-97",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2609,7 +2609,7 @@
    "referenced_type" : "type-100",
    "self_type" : "type-101",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2618,7 +2618,7 @@
    "referenced_type" : "type-102",
    "self_type" : "type-103",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2627,7 +2627,7 @@
    "referenced_type" : "type-22",
    "self_type" : "type-21",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2636,7 +2636,7 @@
    "referenced_type" : "type-225",
    "self_type" : "type-224",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2645,7 +2645,7 @@
    "referenced_type" : "type-239",
    "self_type" : "type-238",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2654,7 +2654,7 @@
    "referenced_type" : "type-270",
    "self_type" : "type-269",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2663,7 +2663,7 @@
    "referenced_type" : "type-301",
    "self_type" : "type-300",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2672,7 +2672,7 @@
    "referenced_type" : "type-40",
    "self_type" : "type-39",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2681,7 +2681,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-170",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2690,7 +2690,7 @@
    "referenced_type" : "type-7",
    "self_type" : "type-6",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2699,7 +2699,7 @@
    "referenced_type" : "type-168",
    "self_type" : "type-167",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2708,7 +2708,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-19",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2717,7 +2717,7 @@
    "referenced_type" : "type-223",
    "self_type" : "type-222",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2726,7 +2726,7 @@
    "referenced_type" : "type-287",
    "self_type" : "type-286",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2735,7 +2735,7 @@
    "referenced_type" : "type-298",
    "self_type" : "type-297",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2744,7 +2744,7 @@
    "referenced_type" : "type-381",
    "self_type" : "type-380",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2753,7 +2753,7 @@
    "referenced_type" : "type-132",
    "self_type" : "type-133",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2762,7 +2762,7 @@
    "referenced_type" : "type-129",
    "self_type" : "type-130",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2771,7 +2771,7 @@
    "referenced_type" : "type-127",
    "self_type" : "type-128",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2780,7 +2780,7 @@
    "referenced_type" : "type-125",
    "self_type" : "type-126",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2789,7 +2789,7 @@
    "referenced_type" : "type-146",
    "self_type" : "type-150",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2798,7 +2798,7 @@
    "referenced_type" : "type-151",
    "self_type" : "type-154",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2807,7 +2807,7 @@
    "referenced_type" : "type-134",
    "self_type" : "type-138",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2816,7 +2816,7 @@
    "referenced_type" : "type-139",
    "self_type" : "type-141",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2825,7 +2825,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-107",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2834,7 +2834,7 @@
    "referenced_type" : "type-104",
    "self_type" : "type-105",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2843,7 +2843,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-157",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2852,7 +2852,7 @@
    "referenced_type" : "type-158",
    "self_type" : "type-159",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2861,7 +2861,7 @@
    "referenced_type" : "type-142",
    "self_type" : "type-143",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2870,7 +2870,7 @@
    "referenced_type" : "type-144",
    "self_type" : "type-145",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2879,7 +2879,7 @@
    "referenced_type" : "type-115",
    "self_type" : "type-121",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2888,7 +2888,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-43",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2897,7 +2897,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-28",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2906,7 +2906,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-57",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -2915,7 +2915,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-49",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2924,7 +2924,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-155",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2933,7 +2933,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-153",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2942,7 +2942,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-33",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2951,7 +2951,7 @@
    "referenced_type" : "type-33",
    "self_type" : "type-32",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2960,7 +2960,7 @@
    "referenced_type" : "type-98",
    "self_type" : "type-99",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2969,7 +2969,7 @@
    "referenced_type" : "type-122",
    "self_type" : "type-123",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2978,7 +2978,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-163",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2987,7 +2987,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-18",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2996,7 +2996,7 @@
    "referenced_type" : "type-24",
    "self_type" : "type-38",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -3005,7 +3005,7 @@
    "referenced_type" : "type-148",
    "self_type" : "type-147",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3014,7 +3014,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-114",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3023,7 +3023,7 @@
    "referenced_type" : "type-13",
    "self_type" : "type-12",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3032,7 +3032,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-166",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3041,7 +3041,7 @@
    "referenced_type" : "type-218",
    "self_type" : "type-217",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3050,7 +3050,7 @@
    "referenced_type" : "type-229",
    "self_type" : "type-246",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3059,7 +3059,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-52",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3068,7 +3068,7 @@
    "referenced_type" : "type-283",
    "self_type" : "type-285",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3077,7 +3077,7 @@
    "referenced_type" : "type-295",
    "self_type" : "type-294",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3086,7 +3086,7 @@
    "referenced_type" : "type-304",
    "self_type" : "type-316",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3095,7 +3095,7 @@
    "referenced_type" : "type-353",
    "self_type" : "type-355",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3104,7 +3104,7 @@
    "referenced_type" : "type-377",
    "self_type" : "type-379",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3113,7 +3113,7 @@
    "referenced_type" : "type-136",
    "self_type" : "type-135",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3122,7 +3122,7 @@
    "referenced_type" : "type-55",
    "self_type" : "type-69",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3131,7 +3131,7 @@
    "referenced_type" : "type-8",
    "self_type" : "type-53",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3140,7 +3140,7 @@
    "referenced_type" : "type-78",
    "self_type" : "type-77",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3149,7 +3149,7 @@
    "referenced_type" : "type-73",
    "self_type" : "type-76",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3158,7 +3158,7 @@
    "referenced_type" : "type-149",
    "self_type" : "type-152",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3167,7 +3167,7 @@
    "referenced_type" : "type-174",
    "self_type" : "type-173",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3176,7 +3176,7 @@
    "referenced_type" : "type-254",
    "self_type" : "type-253",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3185,7 +3185,7 @@
    "referenced_type" : "type-289",
    "self_type" : "type-288",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3194,7 +3194,7 @@
    "referenced_type" : "type-322",
    "self_type" : "type-321",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3203,7 +3203,7 @@
    "referenced_type" : "type-328",
    "self_type" : "type-327",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "alignment" : 4,
@@ -3212,7 +3212,7 @@
    "referenced_type" : "type-387",
    "self_type" : "type-386",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3221,7 +3221,7 @@
    "referenced_type" : "type-62",
    "self_type" : "type-61",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3230,7 +3230,7 @@
    "referenced_type" : "type-81",
    "self_type" : "type-80",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "alignment" : 4,
@@ -3239,7 +3239,7 @@
    "referenced_type" : "type-275",
    "self_type" : "type-274",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3248,7 +3248,7 @@
    "referenced_type" : "type-278",
    "self_type" : "type-277",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3257,7 +3257,7 @@
    "referenced_type" : "type-95",
    "self_type" : "type-94",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3266,7 +3266,7 @@
    "referenced_type" : "type-137",
    "self_type" : "type-140",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3275,7 +3275,7 @@
    "referenced_type" : "type-31",
    "self_type" : "type-70",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3284,7 +3284,7 @@
    "referenced_type" : "type-71",
    "self_type" : "type-72",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3293,7 +3293,7 @@
    "referenced_type" : "type-64",
    "self_type" : "type-63",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -3302,7 +3302,7 @@
    "referenced_type" : "type-56",
    "self_type" : "type-131",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   }
  ],
  "qualified_types" :
@@ -3315,7 +3315,7 @@
    "referenced_type" : "type-96",
    "self_type" : "type-98",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -3325,7 +3325,7 @@
    "referenced_type" : "type-115",
    "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3335,7 +3335,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-66",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -3345,7 +3345,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-15",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -3355,7 +3355,7 @@
    "referenced_type" : "type-11",
    "self_type" : "type-124",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -3365,7 +3365,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-24",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -3375,7 +3375,7 @@
    "referenced_type" : "type-8",
    "self_type" : "type-116",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -3385,7 +3385,7 @@
    "referenced_type" : "type-149",
    "self_type" : "type-148",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3395,7 +3395,7 @@
    "referenced_type" : "type-113",
    "self_type" : "type-112",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3405,7 +3405,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3415,7 +3415,7 @@
    "referenced_type" : "type-165",
    "self_type" : "type-164",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3425,7 +3425,7 @@
    "referenced_type" : "type-219",
    "self_type" : "type-218",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3435,7 +3435,7 @@
    "referenced_type" : "type-230",
    "self_type" : "type-229",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3445,7 +3445,7 @@
    "referenced_type" : "type-251",
    "self_type" : "type-250",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3455,7 +3455,7 @@
    "referenced_type" : "type-261",
    "self_type" : "type-260",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -3465,7 +3465,7 @@
    "referenced_type" : "type-27",
    "self_type" : "type-26",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3475,7 +3475,7 @@
    "referenced_type" : "type-284",
    "self_type" : "type-283",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3485,7 +3485,7 @@
    "referenced_type" : "type-296",
    "self_type" : "type-295",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3495,7 +3495,7 @@
    "referenced_type" : "type-305",
    "self_type" : "type-304",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3505,7 +3505,7 @@
    "referenced_type" : "type-319",
    "self_type" : "type-318",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3515,7 +3515,7 @@
    "referenced_type" : "type-325",
    "self_type" : "type-324",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -3525,7 +3525,7 @@
    "referenced_type" : "type-330",
    "self_type" : "type-329",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3535,7 +3535,7 @@
    "referenced_type" : "type-354",
    "self_type" : "type-353",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3545,7 +3545,7 @@
    "referenced_type" : "type-378",
    "self_type" : "type-377",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3555,7 +3555,7 @@
    "referenced_type" : "type-59",
    "self_type" : "type-58",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3565,7 +3565,7 @@
    "referenced_type" : "type-75",
    "self_type" : "type-74",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -3575,7 +3575,7 @@
    "referenced_type" : "type-85",
    "self_type" : "type-84",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3585,7 +3585,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-108",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3595,7 +3595,7 @@
    "referenced_type" : "type-213",
    "self_type" : "type-212",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3605,7 +3605,7 @@
    "referenced_type" : "type-241",
    "self_type" : "type-240",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3615,7 +3615,7 @@
    "referenced_type" : "type-280",
    "self_type" : "type-279",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3625,7 +3625,7 @@
    "referenced_type" : "type-291",
    "self_type" : "type-290",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3635,7 +3635,7 @@
    "referenced_type" : "type-312",
    "self_type" : "type-311",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3645,7 +3645,7 @@
    "referenced_type" : "type-350",
    "self_type" : "type-349",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3655,7 +3655,7 @@
    "referenced_type" : "type-372",
    "self_type" : "type-371",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3665,7 +3665,7 @@
    "referenced_type" : "type-3",
    "self_type" : "type-2",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3675,7 +3675,7 @@
    "referenced_type" : "type-42",
    "self_type" : "type-41",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3685,7 +3685,7 @@
    "referenced_type" : "type-46",
    "self_type" : "type-45",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3695,7 +3695,7 @@
    "referenced_type" : "type-337",
    "self_type" : "type-336",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3705,7 +3705,7 @@
    "referenced_type" : "type-91",
    "self_type" : "type-90",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3715,7 +3715,7 @@
    "referenced_type" : "type-268",
    "self_type" : "type-267",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3725,7 +3725,7 @@
    "referenced_type" : "type-272",
    "self_type" : "type-271",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3735,7 +3735,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-82",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3745,7 +3745,7 @@
    "referenced_type" : "type-333",
    "self_type" : "type-332",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3755,7 +3755,7 @@
    "referenced_type" : "type-88",
    "self_type" : "type-87",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 1,
@@ -3765,7 +3765,7 @@
    "referenced_type" : "type-137",
    "self_type" : "type-136",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -3773,7 +3773,7 @@
    "name" : "const void",
    "referenced_type" : "type-56",
    "self_type" : "type-55",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   }
  ],
  "record_types" :
@@ -3806,7 +3806,7 @@
    "referenced_type" : "type-96",
    "self_type" : "type-96",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS13CapturedStdFd"
   },
   {
@@ -3823,7 +3823,7 @@
    "referenced_type" : "type-100",
    "self_type" : "type-100",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS14CapturedStderr"
   },
   {
@@ -3840,7 +3840,7 @@
    "referenced_type" : "type-102",
    "self_type" : "type-102",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS14CapturedStdout"
   },
   {
@@ -3864,7 +3864,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-169",
    "size" : 1025,
-   "source_file" : "/system/core/base/include/android-base/file.h",
+   "source_file" : "/system/libbase/include/android-base/file.h",
    "unique_id" : "_ZTS12TemporaryDir"
   },
   {
@@ -3893,7 +3893,7 @@
    "referenced_type" : "type-7",
    "self_type" : "type-7",
    "size" : 1032,
-   "source_file" : "/system/core/base/include/android-base/file.h",
+   "source_file" : "/system/libbase/include/android-base/file.h",
    "unique_id" : "_ZTS13TemporaryFile"
   },
   {
@@ -3903,7 +3903,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-17",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -3925,7 +3925,7 @@
    "referenced_type" : "type-132",
    "self_type" : "type-132",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-33", "type-33" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
   },
@@ -3948,7 +3948,7 @@
    "referenced_type" : "type-129",
    "self_type" : "type-129",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-33", "type-38" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
   },
@@ -3971,7 +3971,7 @@
    "referenced_type" : "type-127",
    "self_type" : "type-127",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-38", "type-33" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
   },
@@ -3994,7 +3994,7 @@
    "referenced_type" : "type-125",
    "self_type" : "type-125",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-38", "type-38" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
   },
@@ -4017,7 +4017,7 @@
    "referenced_type" : "type-146",
    "self_type" : "type-146",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-147", "type-147" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
@@ -4040,7 +4040,7 @@
    "referenced_type" : "type-151",
    "self_type" : "type-151",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-147", "type-152" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
@@ -4063,7 +4063,7 @@
    "referenced_type" : "type-134",
    "self_type" : "type-134",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-135", "type-135" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
   },
@@ -4086,7 +4086,7 @@
    "referenced_type" : "type-139",
    "self_type" : "type-139",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-135", "type-140" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
   },
@@ -4109,7 +4109,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-106",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-8", "type-8" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIiiEE"
   },
@@ -4132,7 +4132,7 @@
    "referenced_type" : "type-104",
    "self_type" : "type-104",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-8", "type-78" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIixEE"
   },
@@ -4155,7 +4155,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-156",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-152", "type-147" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
@@ -4178,7 +4178,7 @@
    "referenced_type" : "type-158",
    "self_type" : "type-158",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-152", "type-152" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
@@ -4201,7 +4201,7 @@
    "referenced_type" : "type-142",
    "self_type" : "type-142",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-140", "type-135" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
   },
@@ -4224,7 +4224,7 @@
    "referenced_type" : "type-144",
    "self_type" : "type-144",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-140", "type-140" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
   },
@@ -4244,7 +4244,7 @@
    "referenced_type" : "type-115",
    "self_type" : "type-115",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
   },
   {
@@ -4263,7 +4263,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-44",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
   },
   {
@@ -4282,7 +4282,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-29",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
   },
   {
@@ -4313,7 +4313,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-54",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h",
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h",
    "unique_id" : "_ZTSN7android4base10MappedFileE"
   },
   {
@@ -4332,7 +4332,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-50",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
   },
   {
@@ -4351,7 +4351,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-67",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h",
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h",
    "unique_id" : "_ZTSN7android4base5TimerE"
   },
   {
@@ -4362,7 +4362,7 @@
    "referenced_type" : "type-1",
    "self_type" : "type-1",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h",
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h",
    "unique_id" : "_ZTSN7android4base10boot_clockE"
   },
   {
@@ -4381,7 +4381,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-16",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "template_args" : [ "type-17" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   }
@@ -4395,7 +4395,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-160",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -4404,7 +4404,7 @@
    "referenced_type" : "type-234",
    "self_type" : "type-233",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -4413,7 +4413,7 @@
    "referenced_type" : "type-307",
    "self_type" : "type-306",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -4422,7 +4422,7 @@
    "referenced_type" : "type-35",
    "self_type" : "type-34",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -4431,7 +4431,7 @@
    "referenced_type" : "type-236",
    "self_type" : "type-235",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -4440,7 +4440,7 @@
    "referenced_type" : "type-309",
    "self_type" : "type-308",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -4449,7 +4449,7 @@
    "referenced_type" : "type-37",
    "self_type" : "type-36",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   }
  ]
 }
diff --git a/29/64/x86/source-based/libbase.so.lsdump b/29/64/x86/source-based/libbase.so.lsdump
index 9e0bea27..689f1f36 100644
--- a/29/64/x86/source-based/libbase.so.lsdump
+++ b/29/64/x86/source-based/libbase.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-9",
    "size" : 1024,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   }
  ],
  "builtin_types" :
@@ -593,7 +593,7 @@
    "referenced_type" : "type-30",
    "self_type" : "type-30",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "type-31",
    "unique_id" : "_ZTSN7android4base5LogIdE"
   },
@@ -635,7 +635,7 @@
    "referenced_type" : "type-51",
    "self_type" : "type-51",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "type-31",
    "unique_id" : "_ZTSN7android4base11LogSeverityE"
   }
@@ -658,7 +658,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -671,7 +671,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -684,7 +684,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -697,7 +697,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -710,7 +710,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "CapturedStdFd::str",
@@ -723,7 +723,7 @@
     }
    ],
    "return_type" : "type-223",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Stop",
@@ -736,7 +736,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Reset",
@@ -749,7 +749,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Start",
@@ -762,7 +762,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -778,7 +778,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -794,7 +794,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -807,7 +807,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -820,7 +820,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "access" : "private",
@@ -837,7 +837,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::release",
@@ -850,7 +850,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -866,7 +866,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -879,7 +879,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -895,7 +895,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -908,7 +908,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -921,7 +921,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -934,7 +934,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::LogMessage::stream",
@@ -947,7 +947,7 @@
     }
    ],
    "return_type" : "type-47",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogLine",
@@ -974,7 +974,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -1005,7 +1005,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -1036,7 +1036,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -1049,7 +1049,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -1062,7 +1062,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -1079,7 +1079,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -1096,7 +1096,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::operator()",
@@ -1127,7 +1127,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromFd",
@@ -1148,7 +1148,7 @@
     }
    ],
    "return_type" : "type-224",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -1161,7 +1161,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -1174,7 +1174,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::SetAborter",
@@ -1186,7 +1186,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -1201,7 +1201,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -1216,7 +1216,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::WriteFully",
@@ -1234,13 +1234,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::boot_clock::now",
    "linker_set_key" : "_ZN7android4base10boot_clock3nowEv",
    "return_type" : "type-228",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "function_name" : "android::base::GetProperty",
@@ -1255,13 +1255,13 @@
     }
    ],
    "return_type" : "type-229",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::GetThreadId",
    "linker_set_key" : "_ZN7android4base11GetThreadIdEv",
    "return_type" : "type-71",
-   "source_file" : "/system/core/base/include/android-base/threads.h"
+   "source_file" : "/system/libbase/include/android-base/threads.h"
   },
   {
    "function_name" : "android::base::InitLogging",
@@ -1281,7 +1281,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetProperty",
@@ -1296,7 +1296,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::StdioLogger",
@@ -1323,7 +1323,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::KernelLogger",
@@ -1350,7 +1350,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StderrLogger",
@@ -1377,7 +1377,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringPrintf",
@@ -1389,13 +1389,13 @@
     }
    ],
    "return_type" : "type-230",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::GetDefaultTag",
    "linker_set_key" : "_ZN7android4base13GetDefaultTagEv",
    "return_type" : "type-231",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetDefaultTag",
@@ -1407,7 +1407,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringAppendF",
@@ -1422,7 +1422,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringAppendV",
@@ -1440,7 +1440,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::DefaultAborter",
@@ -1452,7 +1452,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ReadFdToString",
@@ -1467,7 +1467,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetBoolProperty",
@@ -1482,7 +1482,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::ParseNetAddress",
@@ -1506,7 +1506,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "function_name" : "android::base::WaitForProperty",
@@ -1525,7 +1525,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::WriteStringToFd",
@@ -1540,7 +1540,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EqualsIgnoreCase",
@@ -1555,7 +1555,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::ReadFileToString",
@@ -1574,13 +1574,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetExecutablePath",
    "linker_set_key" : "_ZN7android4base17GetExecutablePathEv",
    "return_type" : "type-235",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ReadFullyAtOffset",
@@ -1601,7 +1601,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -1617,7 +1617,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -1633,7 +1633,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -1646,7 +1646,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -1659,7 +1659,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -1678,7 +1678,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -1706,7 +1706,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWithIgnoreCase",
@@ -1721,7 +1721,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::RemoveFileIfExists",
@@ -1737,7 +1737,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::StartsWithIgnoreCase",
@@ -1752,13 +1752,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::GetMinimumLogSeverity",
    "linker_set_key" : "_ZN7android4base21GetMinimumLogSeverityEv",
    "return_type" : "type-51",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetMinimumLogSeverity",
@@ -1770,13 +1770,13 @@
     }
    ],
    "return_type" : "type-51",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::GetExecutableDirectory",
    "linker_set_key" : "_ZN7android4base22GetExecutableDirectoryEv",
    "return_type" : "type-240",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SystemErrorCodeToString",
@@ -1788,7 +1788,7 @@
     }
    ],
    "return_type" : "type-241",
-   "source_file" : "/system/core/base/include/android-base/errors.h"
+   "source_file" : "/system/libbase/include/android-base/errors.h"
   },
   {
    "function_name" : "android::base::WaitForPropertyCreation",
@@ -1804,7 +1804,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::SendFileDescriptorVector",
@@ -1825,7 +1825,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::ReceiveFileDescriptorVector",
@@ -1849,7 +1849,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::Join",
@@ -1864,7 +1864,7 @@
     }
    ],
    "return_type" : "type-243",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-244", "type-148" ]
   },
   {
@@ -1880,7 +1880,7 @@
     }
    ],
    "return_type" : "type-245",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-246", "type-10" ]
   },
   {
@@ -1896,7 +1896,7 @@
     }
    ],
    "return_type" : "type-247",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-248", "type-148" ]
   },
   {
@@ -1912,7 +1912,7 @@
     }
    ],
    "return_type" : "type-249",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-250", "type-10" ]
   },
   {
@@ -1925,7 +1925,7 @@
     }
    ],
    "return_type" : "type-251",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Split",
@@ -1940,7 +1940,7 @@
     }
    ],
    "return_type" : "type-252",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Dirname",
@@ -1952,7 +1952,7 @@
     }
    ],
    "return_type" : "type-253",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Basename",
@@ -1964,7 +1964,7 @@
     }
    ],
    "return_type" : "type-254",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -1979,7 +1979,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -1994,7 +1994,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Readlink",
@@ -2009,7 +2009,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Realpath",
@@ -2024,7 +2024,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ParseUint",
@@ -2047,7 +2047,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-185" ]
   },
   {
@@ -2071,7 +2071,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-31" ]
   },
   {
@@ -2095,7 +2095,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-64" ]
   },
   {
@@ -2119,7 +2119,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-71" ]
   },
   {
@@ -2138,7 +2138,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SetLogger",
@@ -2150,7 +2150,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::operator<<",
@@ -2165,7 +2165,7 @@
     }
    ],
    "return_type" : "type-219",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -2179,7 +2179,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   }
  ],
  "global_vars" : [],
@@ -2192,7 +2192,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-65",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2201,7 +2201,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-118",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2210,7 +2210,7 @@
    "referenced_type" : "type-120",
    "self_type" : "type-119",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2219,7 +2219,7 @@
    "referenced_type" : "type-13",
    "self_type" : "type-23",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2228,7 +2228,7 @@
    "referenced_type" : "type-134",
    "self_type" : "type-136",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2237,7 +2237,7 @@
    "referenced_type" : "type-140",
    "self_type" : "type-142",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -2246,7 +2246,7 @@
    "referenced_type" : "type-146",
    "self_type" : "type-148",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2255,7 +2255,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2264,7 +2264,7 @@
    "referenced_type" : "type-58",
    "self_type" : "type-60",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2273,7 +2273,7 @@
    "referenced_type" : "type-74",
    "self_type" : "type-79",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -2282,7 +2282,7 @@
    "referenced_type" : "type-153",
    "self_type" : "type-155",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2291,7 +2291,7 @@
    "referenced_type" : "type-82",
    "self_type" : "type-91",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2300,7 +2300,7 @@
    "referenced_type" : "type-86",
    "self_type" : "type-88",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2309,7 +2309,7 @@
    "referenced_type" : "type-149",
    "self_type" : "type-152",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2318,7 +2318,7 @@
    "referenced_type" : "type-108",
    "self_type" : "type-107",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2327,7 +2327,7 @@
    "referenced_type" : "type-131",
    "self_type" : "type-130",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2336,7 +2336,7 @@
    "referenced_type" : "type-176",
    "self_type" : "type-175",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2345,7 +2345,7 @@
    "referenced_type" : "type-210",
    "self_type" : "type-209",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2354,7 +2354,7 @@
    "referenced_type" : "type-220",
    "self_type" : "type-219",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2363,7 +2363,7 @@
    "referenced_type" : "type-48",
    "self_type" : "type-47",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2372,7 +2372,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-4",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2381,7 +2381,7 @@
    "referenced_type" : "type-81",
    "self_type" : "type-80",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2390,7 +2390,7 @@
    "referenced_type" : "type-97",
    "self_type" : "type-96",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   }
  ],
  "pointer_types" :
@@ -2402,7 +2402,7 @@
    "referenced_type" : "type-157",
    "self_type" : "type-158",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2411,7 +2411,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-163",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2420,7 +2420,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-165",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2429,7 +2429,7 @@
    "referenced_type" : "type-117",
    "self_type" : "type-116",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2438,7 +2438,7 @@
    "referenced_type" : "type-22",
    "self_type" : "type-21",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2447,7 +2447,7 @@
    "referenced_type" : "type-40",
    "self_type" : "type-39",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2456,7 +2456,7 @@
    "referenced_type" : "type-85",
    "self_type" : "type-84",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2465,7 +2465,7 @@
    "referenced_type" : "type-217",
    "self_type" : "type-218",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2474,7 +2474,7 @@
    "referenced_type" : "type-7",
    "self_type" : "type-6",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2483,7 +2483,7 @@
    "referenced_type" : "type-102",
    "self_type" : "type-101",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2492,7 +2492,7 @@
    "referenced_type" : "type-115",
    "self_type" : "type-114",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2501,7 +2501,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-19",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2510,7 +2510,7 @@
    "referenced_type" : "type-216",
    "self_type" : "type-215",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2519,7 +2519,7 @@
    "referenced_type" : "type-177",
    "self_type" : "type-181",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2528,7 +2528,7 @@
    "referenced_type" : "type-166",
    "self_type" : "type-171",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2537,7 +2537,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-160",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2546,7 +2546,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-151",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2555,7 +2555,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-198",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2564,7 +2564,7 @@
    "referenced_type" : "type-199",
    "self_type" : "type-202",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2573,7 +2573,7 @@
    "referenced_type" : "type-182",
    "self_type" : "type-186",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2582,7 +2582,7 @@
    "referenced_type" : "type-187",
    "self_type" : "type-189",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2591,7 +2591,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-170",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2600,7 +2600,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-168",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2609,7 +2609,7 @@
    "referenced_type" : "type-204",
    "self_type" : "type-205",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2618,7 +2618,7 @@
    "referenced_type" : "type-206",
    "self_type" : "type-207",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2627,7 +2627,7 @@
    "referenced_type" : "type-190",
    "self_type" : "type-191",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2636,7 +2636,7 @@
    "referenced_type" : "type-192",
    "self_type" : "type-193",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2645,7 +2645,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-126",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2654,7 +2654,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-43",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2663,7 +2663,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-28",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2672,7 +2672,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-57",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -2681,7 +2681,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-49",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2690,7 +2690,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-203",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2699,7 +2699,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-201",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2708,7 +2708,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-33",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2717,7 +2717,7 @@
    "referenced_type" : "type-33",
    "self_type" : "type-32",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2726,7 +2726,7 @@
    "referenced_type" : "type-159",
    "self_type" : "type-161",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2735,7 +2735,7 @@
    "referenced_type" : "type-129",
    "self_type" : "type-133",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2744,7 +2744,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-211",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2753,7 +2753,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-18",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2762,7 +2762,7 @@
    "referenced_type" : "type-24",
    "self_type" : "type-38",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2771,7 +2771,7 @@
    "referenced_type" : "type-196",
    "self_type" : "type-195",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2780,7 +2780,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-111",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2789,7 +2789,7 @@
    "referenced_type" : "type-120",
    "self_type" : "type-132",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2798,7 +2798,7 @@
    "referenced_type" : "type-13",
    "self_type" : "type-12",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2807,7 +2807,7 @@
    "referenced_type" : "type-178",
    "self_type" : "type-180",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2816,7 +2816,7 @@
    "referenced_type" : "type-212",
    "self_type" : "type-214",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2825,7 +2825,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-52",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2834,7 +2834,7 @@
    "referenced_type" : "type-98",
    "self_type" : "type-100",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2843,7 +2843,7 @@
    "referenced_type" : "type-184",
    "self_type" : "type-183",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2852,7 +2852,7 @@
    "referenced_type" : "type-55",
    "self_type" : "type-69",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2861,7 +2861,7 @@
    "referenced_type" : "type-8",
    "self_type" : "type-53",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2870,7 +2870,7 @@
    "referenced_type" : "type-78",
    "self_type" : "type-77",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2879,7 +2879,7 @@
    "referenced_type" : "type-73",
    "self_type" : "type-76",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2888,7 +2888,7 @@
    "referenced_type" : "type-197",
    "self_type" : "type-200",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2897,7 +2897,7 @@
    "referenced_type" : "type-104",
    "self_type" : "type-103",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2906,7 +2906,7 @@
    "referenced_type" : "type-138",
    "self_type" : "type-137",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2915,7 +2915,7 @@
    "referenced_type" : "type-145",
    "self_type" : "type-144",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "alignment" : 4,
@@ -2924,7 +2924,7 @@
    "referenced_type" : "type-222",
    "self_type" : "type-221",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2933,7 +2933,7 @@
    "referenced_type" : "type-62",
    "self_type" : "type-61",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2942,7 +2942,7 @@
    "referenced_type" : "type-90",
    "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2951,7 +2951,7 @@
    "referenced_type" : "type-93",
    "self_type" : "type-92",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2960,7 +2960,7 @@
    "referenced_type" : "type-185",
    "self_type" : "type-188",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2969,7 +2969,7 @@
    "referenced_type" : "type-31",
    "self_type" : "type-70",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2978,7 +2978,7 @@
    "referenced_type" : "type-71",
    "self_type" : "type-72",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2987,7 +2987,7 @@
    "referenced_type" : "type-64",
    "self_type" : "type-63",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2996,7 +2996,7 @@
    "referenced_type" : "type-56",
    "self_type" : "type-172",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   }
  ],
  "qualified_types" :
@@ -3009,7 +3009,7 @@
    "referenced_type" : "type-157",
    "self_type" : "type-159",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -3019,7 +3019,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-129",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3029,7 +3029,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-66",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -3039,7 +3039,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-15",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -3049,7 +3049,7 @@
    "referenced_type" : "type-11",
    "self_type" : "type-139",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -3059,7 +3059,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-24",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -3069,7 +3069,7 @@
    "referenced_type" : "type-8",
    "self_type" : "type-110",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -3079,7 +3079,7 @@
    "referenced_type" : "type-197",
    "self_type" : "type-196",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3089,7 +3089,7 @@
    "referenced_type" : "type-113",
    "self_type" : "type-112",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3099,7 +3099,7 @@
    "referenced_type" : "type-121",
    "self_type" : "type-120",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3109,7 +3109,7 @@
    "referenced_type" : "type-135",
    "self_type" : "type-134",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3119,7 +3119,7 @@
    "referenced_type" : "type-141",
    "self_type" : "type-140",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -3129,7 +3129,7 @@
    "referenced_type" : "type-147",
    "self_type" : "type-146",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3139,7 +3139,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3149,7 +3149,7 @@
    "referenced_type" : "type-179",
    "self_type" : "type-178",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3159,7 +3159,7 @@
    "referenced_type" : "type-213",
    "self_type" : "type-212",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3169,7 +3169,7 @@
    "referenced_type" : "type-27",
    "self_type" : "type-26",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3179,7 +3179,7 @@
    "referenced_type" : "type-59",
    "self_type" : "type-58",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3189,7 +3189,7 @@
    "referenced_type" : "type-75",
    "self_type" : "type-74",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -3199,7 +3199,7 @@
    "referenced_type" : "type-99",
    "self_type" : "type-98",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3209,7 +3209,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-105",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3219,7 +3219,7 @@
    "referenced_type" : "type-128",
    "self_type" : "type-127",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3229,7 +3229,7 @@
    "referenced_type" : "type-174",
    "self_type" : "type-173",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3239,7 +3239,7 @@
    "referenced_type" : "type-3",
    "self_type" : "type-2",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3249,7 +3249,7 @@
    "referenced_type" : "type-42",
    "self_type" : "type-41",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3259,7 +3259,7 @@
    "referenced_type" : "type-46",
    "self_type" : "type-45",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3269,7 +3269,7 @@
    "referenced_type" : "type-95",
    "self_type" : "type-94",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3279,7 +3279,7 @@
    "referenced_type" : "type-154",
    "self_type" : "type-153",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3289,7 +3289,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-82",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3299,7 +3299,7 @@
    "referenced_type" : "type-87",
    "self_type" : "type-86",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3309,7 +3309,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-149",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 1,
@@ -3319,7 +3319,7 @@
    "referenced_type" : "type-185",
    "self_type" : "type-184",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -3327,7 +3327,7 @@
    "name" : "const void",
    "referenced_type" : "type-56",
    "self_type" : "type-55",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   }
  ],
  "record_types" :
@@ -3360,7 +3360,7 @@
    "referenced_type" : "type-157",
    "self_type" : "type-157",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS13CapturedStdFd"
   },
   {
@@ -3377,7 +3377,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-162",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS14CapturedStderr"
   },
   {
@@ -3394,7 +3394,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-164",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS14CapturedStdout"
   },
   {
@@ -3418,7 +3418,7 @@
    "referenced_type" : "type-217",
    "self_type" : "type-217",
    "size" : 1025,
-   "source_file" : "/system/core/base/include/android-base/file.h",
+   "source_file" : "/system/libbase/include/android-base/file.h",
    "unique_id" : "_ZTS12TemporaryDir"
   },
   {
@@ -3447,7 +3447,7 @@
    "referenced_type" : "type-7",
    "self_type" : "type-7",
    "size" : 1032,
-   "source_file" : "/system/core/base/include/android-base/file.h",
+   "source_file" : "/system/libbase/include/android-base/file.h",
    "unique_id" : "_ZTS13TemporaryFile"
   },
   {
@@ -3457,7 +3457,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-17",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -3479,7 +3479,7 @@
    "referenced_type" : "type-177",
    "self_type" : "type-177",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-33", "type-33" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
   },
@@ -3502,7 +3502,7 @@
    "referenced_type" : "type-166",
    "self_type" : "type-166",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-33", "type-38" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
   },
@@ -3525,7 +3525,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-156",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-38", "type-33" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
   },
@@ -3548,7 +3548,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-143",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-38", "type-38" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
   },
@@ -3571,7 +3571,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-194",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-195", "type-195" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
@@ -3594,7 +3594,7 @@
    "referenced_type" : "type-199",
    "self_type" : "type-199",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-195", "type-200" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
@@ -3617,7 +3617,7 @@
    "referenced_type" : "type-182",
    "self_type" : "type-182",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-183", "type-183" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
   },
@@ -3640,7 +3640,7 @@
    "referenced_type" : "type-187",
    "self_type" : "type-187",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-183", "type-188" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
   },
@@ -3663,7 +3663,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-169",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-8", "type-8" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIiiEE"
   },
@@ -3686,7 +3686,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-167",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-8", "type-78" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIixEE"
   },
@@ -3709,7 +3709,7 @@
    "referenced_type" : "type-204",
    "self_type" : "type-204",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-200", "type-195" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
@@ -3732,7 +3732,7 @@
    "referenced_type" : "type-206",
    "self_type" : "type-206",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-200", "type-200" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
@@ -3755,7 +3755,7 @@
    "referenced_type" : "type-190",
    "self_type" : "type-190",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-188", "type-183" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
   },
@@ -3778,7 +3778,7 @@
    "referenced_type" : "type-192",
    "self_type" : "type-192",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-188", "type-188" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
   },
@@ -3798,7 +3798,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-109",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
   },
   {
@@ -3817,7 +3817,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-44",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
   },
   {
@@ -3836,7 +3836,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-29",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
   },
   {
@@ -3867,7 +3867,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-54",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h",
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h",
    "unique_id" : "_ZTSN7android4base10MappedFileE"
   },
   {
@@ -3886,7 +3886,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-50",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
   },
   {
@@ -3905,7 +3905,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-67",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h",
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h",
    "unique_id" : "_ZTSN7android4base5TimerE"
   },
   {
@@ -3916,7 +3916,7 @@
    "referenced_type" : "type-1",
    "self_type" : "type-1",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h",
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h",
    "unique_id" : "_ZTSN7android4base10boot_clockE"
   },
   {
@@ -3935,7 +3935,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-16",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "template_args" : [ "type-17" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   }
@@ -3949,7 +3949,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-208",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -3958,7 +3958,7 @@
    "referenced_type" : "type-123",
    "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3967,7 +3967,7 @@
    "referenced_type" : "type-35",
    "self_type" : "type-34",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3976,7 +3976,7 @@
    "referenced_type" : "type-125",
    "self_type" : "type-124",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3985,7 +3985,7 @@
    "referenced_type" : "type-37",
    "self_type" : "type-36",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   }
  ]
 }
diff --git a/29/64/x86_64/source-based/libbase.so.lsdump b/29/64/x86_64/source-based/libbase.so.lsdump
index f143bc72..dffeb1fa 100644
--- a/29/64/x86_64/source-based/libbase.so.lsdump
+++ b/29/64/x86_64/source-based/libbase.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-9",
    "size" : 1024,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   }
  ],
  "builtin_types" :
@@ -581,7 +581,7 @@
    "referenced_type" : "type-30",
    "self_type" : "type-30",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "type-31",
    "unique_id" : "_ZTSN7android4base5LogIdE"
   },
@@ -623,7 +623,7 @@
    "referenced_type" : "type-51",
    "self_type" : "type-51",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "type-31",
    "unique_id" : "_ZTSN7android4base11LogSeverityE"
   }
@@ -646,7 +646,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -659,7 +659,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -672,7 +672,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -685,7 +685,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -698,7 +698,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "CapturedStdFd::str",
@@ -711,7 +711,7 @@
     }
    ],
    "return_type" : "type-225",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Stop",
@@ -724,7 +724,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Reset",
@@ -737,7 +737,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Start",
@@ -750,7 +750,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -766,7 +766,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -782,7 +782,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -795,7 +795,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -808,7 +808,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "access" : "private",
@@ -825,7 +825,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::release",
@@ -838,7 +838,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -854,7 +854,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -867,7 +867,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -883,7 +883,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -896,7 +896,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -909,7 +909,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -922,7 +922,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::LogMessage::stream",
@@ -935,7 +935,7 @@
     }
    ],
    "return_type" : "type-47",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogLine",
@@ -962,7 +962,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -993,7 +993,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -1024,7 +1024,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -1037,7 +1037,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -1050,7 +1050,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -1067,7 +1067,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -1084,7 +1084,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::operator()",
@@ -1115,7 +1115,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromFd",
@@ -1136,7 +1136,7 @@
     }
    ],
    "return_type" : "type-226",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -1149,7 +1149,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -1162,7 +1162,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::SetAborter",
@@ -1174,7 +1174,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -1189,7 +1189,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -1204,7 +1204,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::WriteFully",
@@ -1222,13 +1222,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::boot_clock::now",
    "linker_set_key" : "_ZN7android4base10boot_clock3nowEv",
    "return_type" : "type-230",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "function_name" : "android::base::GetProperty",
@@ -1243,13 +1243,13 @@
     }
    ],
    "return_type" : "type-231",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::GetThreadId",
    "linker_set_key" : "_ZN7android4base11GetThreadIdEv",
    "return_type" : "type-55",
-   "source_file" : "/system/core/base/include/android-base/threads.h"
+   "source_file" : "/system/libbase/include/android-base/threads.h"
   },
   {
    "function_name" : "android::base::InitLogging",
@@ -1269,7 +1269,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetProperty",
@@ -1284,7 +1284,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::StdioLogger",
@@ -1311,7 +1311,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::KernelLogger",
@@ -1338,7 +1338,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StderrLogger",
@@ -1365,7 +1365,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringPrintf",
@@ -1377,13 +1377,13 @@
     }
    ],
    "return_type" : "type-232",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::GetDefaultTag",
    "linker_set_key" : "_ZN7android4base13GetDefaultTagEv",
    "return_type" : "type-233",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetDefaultTag",
@@ -1395,7 +1395,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringAppendF",
@@ -1410,7 +1410,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringAppendV",
@@ -1428,7 +1428,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::DefaultAborter",
@@ -1440,7 +1440,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ReadFdToString",
@@ -1455,7 +1455,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetBoolProperty",
@@ -1470,7 +1470,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::ParseNetAddress",
@@ -1494,7 +1494,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "function_name" : "android::base::WaitForProperty",
@@ -1513,7 +1513,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::WriteStringToFd",
@@ -1528,7 +1528,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EqualsIgnoreCase",
@@ -1543,7 +1543,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::ReadFileToString",
@@ -1562,13 +1562,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetExecutablePath",
    "linker_set_key" : "_ZN7android4base17GetExecutablePathEv",
    "return_type" : "type-237",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ReadFullyAtOffset",
@@ -1589,7 +1589,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -1605,7 +1605,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -1621,7 +1621,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -1634,7 +1634,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -1647,7 +1647,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -1666,7 +1666,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -1694,7 +1694,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWithIgnoreCase",
@@ -1709,7 +1709,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::RemoveFileIfExists",
@@ -1725,7 +1725,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::StartsWithIgnoreCase",
@@ -1740,13 +1740,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::GetMinimumLogSeverity",
    "linker_set_key" : "_ZN7android4base21GetMinimumLogSeverityEv",
    "return_type" : "type-51",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetMinimumLogSeverity",
@@ -1758,13 +1758,13 @@
     }
    ],
    "return_type" : "type-51",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::GetExecutableDirectory",
    "linker_set_key" : "_ZN7android4base22GetExecutableDirectoryEv",
    "return_type" : "type-242",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SystemErrorCodeToString",
@@ -1776,7 +1776,7 @@
     }
    ],
    "return_type" : "type-243",
-   "source_file" : "/system/core/base/include/android-base/errors.h"
+   "source_file" : "/system/libbase/include/android-base/errors.h"
   },
   {
    "function_name" : "android::base::WaitForPropertyCreation",
@@ -1792,7 +1792,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::SendFileDescriptorVector",
@@ -1813,7 +1813,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::ReceiveFileDescriptorVector",
@@ -1837,7 +1837,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::Join",
@@ -1852,7 +1852,7 @@
     }
    ],
    "return_type" : "type-245",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-246", "type-148" ]
   },
   {
@@ -1868,7 +1868,7 @@
     }
    ],
    "return_type" : "type-247",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-248", "type-10" ]
   },
   {
@@ -1884,7 +1884,7 @@
     }
    ],
    "return_type" : "type-249",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-250", "type-148" ]
   },
   {
@@ -1900,7 +1900,7 @@
     }
    ],
    "return_type" : "type-251",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-252", "type-10" ]
   },
   {
@@ -1913,7 +1913,7 @@
     }
    ],
    "return_type" : "type-253",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Split",
@@ -1928,7 +1928,7 @@
     }
    ],
    "return_type" : "type-254",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Dirname",
@@ -1940,7 +1940,7 @@
     }
    ],
    "return_type" : "type-255",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Basename",
@@ -1952,7 +1952,7 @@
     }
    ],
    "return_type" : "type-256",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -1967,7 +1967,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -1982,7 +1982,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Readlink",
@@ -1997,7 +1997,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Realpath",
@@ -2012,7 +2012,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ParseUint",
@@ -2035,7 +2035,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-187" ]
   },
   {
@@ -2059,7 +2059,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-31" ]
   },
   {
@@ -2083,7 +2083,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-55" ]
   },
   {
@@ -2107,7 +2107,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-63" ]
   },
   {
@@ -2126,7 +2126,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SetLogger",
@@ -2138,7 +2138,7 @@
     }
    ],
    "return_type" : "type-69",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::operator<<",
@@ -2153,7 +2153,7 @@
     }
    ],
    "return_type" : "type-219",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -2167,7 +2167,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   }
  ],
  "global_vars" : [],
@@ -2180,7 +2180,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-64",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -2189,7 +2189,7 @@
    "referenced_type" : "type-110",
    "self_type" : "type-116",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -2198,7 +2198,7 @@
    "referenced_type" : "type-118",
    "self_type" : "type-117",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2207,7 +2207,7 @@
    "referenced_type" : "type-13",
    "self_type" : "type-23",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -2216,7 +2216,7 @@
    "referenced_type" : "type-132",
    "self_type" : "type-134",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 8,
@@ -2225,7 +2225,7 @@
    "referenced_type" : "type-138",
    "self_type" : "type-140",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -2234,7 +2234,7 @@
    "referenced_type" : "type-146",
    "self_type" : "type-148",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -2243,7 +2243,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2252,7 +2252,7 @@
    "referenced_type" : "type-58",
    "self_type" : "type-60",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 8,
@@ -2261,7 +2261,7 @@
    "referenced_type" : "type-74",
    "self_type" : "type-79",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -2270,7 +2270,7 @@
    "referenced_type" : "type-153",
    "self_type" : "type-155",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -2279,7 +2279,7 @@
    "referenced_type" : "type-84",
    "self_type" : "type-86",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -2288,7 +2288,7 @@
    "referenced_type" : "type-87",
    "self_type" : "type-91",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -2297,7 +2297,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-152",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -2306,7 +2306,7 @@
    "referenced_type" : "type-108",
    "self_type" : "type-107",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2315,7 +2315,7 @@
    "referenced_type" : "type-130",
    "self_type" : "type-129",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2324,7 +2324,7 @@
    "referenced_type" : "type-176",
    "self_type" : "type-175",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2333,7 +2333,7 @@
    "referenced_type" : "type-213",
    "self_type" : "type-212",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2342,7 +2342,7 @@
    "referenced_type" : "type-220",
    "self_type" : "type-219",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -2351,7 +2351,7 @@
    "referenced_type" : "type-48",
    "self_type" : "type-47",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2360,7 +2360,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-4",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2369,7 +2369,7 @@
    "referenced_type" : "type-81",
    "self_type" : "type-80",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -2378,7 +2378,7 @@
    "referenced_type" : "type-95",
    "self_type" : "type-94",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   }
  ],
  "pointer_types" :
@@ -2390,7 +2390,7 @@
    "referenced_type" : "type-158",
    "self_type" : "type-159",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -2399,7 +2399,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-164",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -2408,7 +2408,7 @@
    "referenced_type" : "type-165",
    "self_type" : "type-166",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -2417,7 +2417,7 @@
    "referenced_type" : "type-115",
    "self_type" : "type-114",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2426,7 +2426,7 @@
    "referenced_type" : "type-22",
    "self_type" : "type-21",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2435,7 +2435,7 @@
    "referenced_type" : "type-40",
    "self_type" : "type-39",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2444,7 +2444,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-82",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2453,7 +2453,7 @@
    "referenced_type" : "type-221",
    "self_type" : "type-222",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -2462,7 +2462,7 @@
    "referenced_type" : "type-7",
    "self_type" : "type-6",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -2471,7 +2471,7 @@
    "referenced_type" : "type-102",
    "self_type" : "type-101",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2480,7 +2480,7 @@
    "referenced_type" : "type-113",
    "self_type" : "type-112",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2489,7 +2489,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-19",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2498,7 +2498,7 @@
    "referenced_type" : "type-218",
    "self_type" : "type-217",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2507,7 +2507,7 @@
    "referenced_type" : "type-145",
    "self_type" : "type-144",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "alignment" : 8,
@@ -2516,7 +2516,7 @@
    "referenced_type" : "type-182",
    "self_type" : "type-183",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2525,7 +2525,7 @@
    "referenced_type" : "type-177",
    "self_type" : "type-181",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2534,7 +2534,7 @@
    "referenced_type" : "type-160",
    "self_type" : "type-171",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2543,7 +2543,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-157",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2552,7 +2552,7 @@
    "referenced_type" : "type-196",
    "self_type" : "type-201",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2561,7 +2561,7 @@
    "referenced_type" : "type-202",
    "self_type" : "type-205",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2570,7 +2570,7 @@
    "referenced_type" : "type-184",
    "self_type" : "type-188",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2579,7 +2579,7 @@
    "referenced_type" : "type-189",
    "self_type" : "type-191",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2588,7 +2588,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-170",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2597,7 +2597,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-168",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2606,7 +2606,7 @@
    "referenced_type" : "type-206",
    "self_type" : "type-207",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2615,7 +2615,7 @@
    "referenced_type" : "type-208",
    "self_type" : "type-209",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2624,7 +2624,7 @@
    "referenced_type" : "type-192",
    "self_type" : "type-193",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2633,7 +2633,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-195",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2642,7 +2642,7 @@
    "referenced_type" : "type-122",
    "self_type" : "type-128",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2651,7 +2651,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-43",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2660,7 +2660,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-28",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2669,7 +2669,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-57",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -2678,7 +2678,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-49",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2687,7 +2687,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-204",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -2696,7 +2696,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-200",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2705,7 +2705,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-33",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2714,7 +2714,7 @@
    "referenced_type" : "type-33",
    "self_type" : "type-32",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2723,7 +2723,7 @@
    "referenced_type" : "type-161",
    "self_type" : "type-162",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -2732,7 +2732,7 @@
    "referenced_type" : "type-137",
    "self_type" : "type-141",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2741,7 +2741,7 @@
    "referenced_type" : "type-65",
    "self_type" : "type-211",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -2750,7 +2750,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-18",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2759,7 +2759,7 @@
    "referenced_type" : "type-24",
    "self_type" : "type-38",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -2768,7 +2768,7 @@
    "referenced_type" : "type-198",
    "self_type" : "type-197",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2777,7 +2777,7 @@
    "referenced_type" : "type-110",
    "self_type" : "type-109",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2786,7 +2786,7 @@
    "referenced_type" : "type-118",
    "self_type" : "type-131",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2795,7 +2795,7 @@
    "referenced_type" : "type-13",
    "self_type" : "type-12",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2804,7 +2804,7 @@
    "referenced_type" : "type-178",
    "self_type" : "type-180",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2813,7 +2813,7 @@
    "referenced_type" : "type-214",
    "self_type" : "type-216",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2822,7 +2822,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-52",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2831,7 +2831,7 @@
    "referenced_type" : "type-98",
    "self_type" : "type-100",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2840,7 +2840,7 @@
    "referenced_type" : "type-186",
    "self_type" : "type-185",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2849,7 +2849,7 @@
    "referenced_type" : "type-68",
    "self_type" : "type-78",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -2858,7 +2858,7 @@
    "referenced_type" : "type-8",
    "self_type" : "type-53",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -2867,7 +2867,7 @@
    "referenced_type" : "type-56",
    "self_type" : "type-77",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -2876,7 +2876,7 @@
    "referenced_type" : "type-73",
    "self_type" : "type-76",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -2885,7 +2885,7 @@
    "referenced_type" : "type-199",
    "self_type" : "type-203",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2894,7 +2894,7 @@
    "referenced_type" : "type-104",
    "self_type" : "type-103",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -2903,7 +2903,7 @@
    "referenced_type" : "type-136",
    "self_type" : "type-135",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 8,
@@ -2912,7 +2912,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-142",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "alignment" : 8,
@@ -2921,7 +2921,7 @@
    "referenced_type" : "type-224",
    "self_type" : "type-223",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -2930,7 +2930,7 @@
    "referenced_type" : "type-62",
    "self_type" : "type-61",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 8,
@@ -2939,7 +2939,7 @@
    "referenced_type" : "type-90",
    "self_type" : "type-89",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -2948,7 +2948,7 @@
    "referenced_type" : "type-97",
    "self_type" : "type-96",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -2957,7 +2957,7 @@
    "referenced_type" : "type-187",
    "self_type" : "type-190",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -2966,7 +2966,7 @@
    "referenced_type" : "type-31",
    "self_type" : "type-71",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -2975,7 +2975,7 @@
    "referenced_type" : "type-55",
    "self_type" : "type-72",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -2984,7 +2984,7 @@
    "referenced_type" : "type-63",
    "self_type" : "type-70",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -2993,7 +2993,7 @@
    "referenced_type" : "type-69",
    "self_type" : "type-172",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   }
  ],
  "qualified_types" :
@@ -3006,7 +3006,7 @@
    "referenced_type" : "type-158",
    "self_type" : "type-161",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -3016,7 +3016,7 @@
    "referenced_type" : "type-122",
    "self_type" : "type-137",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3026,7 +3026,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-65",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -3036,7 +3036,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-15",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -3046,7 +3046,7 @@
    "referenced_type" : "type-11",
    "self_type" : "type-149",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -3056,7 +3056,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-24",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -3066,7 +3066,7 @@
    "referenced_type" : "type-8",
    "self_type" : "type-123",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -3076,7 +3076,7 @@
    "referenced_type" : "type-199",
    "self_type" : "type-198",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3086,7 +3086,7 @@
    "referenced_type" : "type-111",
    "self_type" : "type-110",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -3096,7 +3096,7 @@
    "referenced_type" : "type-119",
    "self_type" : "type-118",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3106,7 +3106,7 @@
    "referenced_type" : "type-133",
    "self_type" : "type-132",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 8,
@@ -3116,7 +3116,7 @@
    "referenced_type" : "type-139",
    "self_type" : "type-138",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -3126,7 +3126,7 @@
    "referenced_type" : "type-147",
    "self_type" : "type-146",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -3136,7 +3136,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -3146,7 +3146,7 @@
    "referenced_type" : "type-179",
    "self_type" : "type-178",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3156,7 +3156,7 @@
    "referenced_type" : "type-215",
    "self_type" : "type-214",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3166,7 +3166,7 @@
    "referenced_type" : "type-27",
    "self_type" : "type-26",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3176,7 +3176,7 @@
    "referenced_type" : "type-59",
    "self_type" : "type-58",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 8,
@@ -3186,7 +3186,7 @@
    "referenced_type" : "type-75",
    "self_type" : "type-74",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -3196,7 +3196,7 @@
    "referenced_type" : "type-99",
    "self_type" : "type-98",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3206,7 +3206,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-105",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3216,7 +3216,7 @@
    "referenced_type" : "type-127",
    "self_type" : "type-126",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3226,7 +3226,7 @@
    "referenced_type" : "type-174",
    "self_type" : "type-173",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3236,7 +3236,7 @@
    "referenced_type" : "type-3",
    "self_type" : "type-2",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3246,7 +3246,7 @@
    "referenced_type" : "type-42",
    "self_type" : "type-41",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3256,7 +3256,7 @@
    "referenced_type" : "type-46",
    "self_type" : "type-45",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3266,7 +3266,7 @@
    "referenced_type" : "type-93",
    "self_type" : "type-92",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3276,7 +3276,7 @@
    "referenced_type" : "type-154",
    "self_type" : "type-153",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -3286,7 +3286,7 @@
    "referenced_type" : "type-85",
    "self_type" : "type-84",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -3296,7 +3296,7 @@
    "referenced_type" : "type-88",
    "self_type" : "type-87",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -3306,7 +3306,7 @@
    "referenced_type" : "type-151",
    "self_type" : "type-150",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 1,
@@ -3316,7 +3316,7 @@
    "referenced_type" : "type-187",
    "self_type" : "type-186",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -3324,7 +3324,7 @@
    "name" : "const void",
    "referenced_type" : "type-69",
    "self_type" : "type-68",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   }
  ],
  "record_types" :
@@ -3357,7 +3357,7 @@
    "referenced_type" : "type-158",
    "self_type" : "type-158",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS13CapturedStdFd"
   },
   {
@@ -3374,7 +3374,7 @@
    "referenced_type" : "type-163",
    "self_type" : "type-163",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS14CapturedStderr"
   },
   {
@@ -3391,7 +3391,7 @@
    "referenced_type" : "type-165",
    "self_type" : "type-165",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS14CapturedStdout"
   },
   {
@@ -3415,7 +3415,7 @@
    "referenced_type" : "type-221",
    "self_type" : "type-221",
    "size" : 1025,
-   "source_file" : "/system/core/base/include/android-base/file.h",
+   "source_file" : "/system/libbase/include/android-base/file.h",
    "unique_id" : "_ZTS12TemporaryDir"
   },
   {
@@ -3444,7 +3444,7 @@
    "referenced_type" : "type-7",
    "self_type" : "type-7",
    "size" : 1032,
-   "source_file" : "/system/core/base/include/android-base/file.h",
+   "source_file" : "/system/libbase/include/android-base/file.h",
    "unique_id" : "_ZTS13TemporaryFile"
   },
   {
@@ -3454,7 +3454,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-17",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -3476,7 +3476,7 @@
    "referenced_type" : "type-182",
    "self_type" : "type-182",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-33", "type-33" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
   },
@@ -3499,7 +3499,7 @@
    "referenced_type" : "type-177",
    "self_type" : "type-177",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-33", "type-38" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
   },
@@ -3522,7 +3522,7 @@
    "referenced_type" : "type-160",
    "self_type" : "type-160",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-38", "type-33" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
   },
@@ -3545,7 +3545,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-156",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-38", "type-38" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
   },
@@ -3568,7 +3568,7 @@
    "referenced_type" : "type-196",
    "self_type" : "type-196",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-197", "type-197" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
@@ -3591,7 +3591,7 @@
    "referenced_type" : "type-202",
    "self_type" : "type-202",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-197", "type-203" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
@@ -3614,7 +3614,7 @@
    "referenced_type" : "type-184",
    "self_type" : "type-184",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-185", "type-185" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
   },
@@ -3637,7 +3637,7 @@
    "referenced_type" : "type-189",
    "self_type" : "type-189",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-185", "type-190" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
   },
@@ -3660,7 +3660,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-169",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-8", "type-8" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIiiEE"
   },
@@ -3683,7 +3683,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-167",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-8", "type-56" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIilEE"
   },
@@ -3706,7 +3706,7 @@
    "referenced_type" : "type-206",
    "self_type" : "type-206",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-203", "type-197" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
@@ -3729,7 +3729,7 @@
    "referenced_type" : "type-208",
    "self_type" : "type-208",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-203", "type-203" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
@@ -3752,7 +3752,7 @@
    "referenced_type" : "type-192",
    "self_type" : "type-192",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-190", "type-185" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
   },
@@ -3775,7 +3775,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-194",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-190", "type-190" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
   },
@@ -3795,7 +3795,7 @@
    "referenced_type" : "type-122",
    "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
   },
   {
@@ -3814,7 +3814,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-44",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
   },
   {
@@ -3833,7 +3833,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-29",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
   },
   {
@@ -3864,7 +3864,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-54",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h",
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h",
    "unique_id" : "_ZTSN7android4base10MappedFileE"
   },
   {
@@ -3883,7 +3883,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-50",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
   },
   {
@@ -3902,7 +3902,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-66",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h",
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h",
    "unique_id" : "_ZTSN7android4base5TimerE"
   },
   {
@@ -3913,7 +3913,7 @@
    "referenced_type" : "type-1",
    "self_type" : "type-1",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h",
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h",
    "unique_id" : "_ZTSN7android4base10boot_clockE"
   },
   {
@@ -3932,7 +3932,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-16",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "template_args" : [ "type-17" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   }
@@ -3946,7 +3946,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-210",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -3955,7 +3955,7 @@
    "referenced_type" : "type-121",
    "self_type" : "type-120",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3964,7 +3964,7 @@
    "referenced_type" : "type-35",
    "self_type" : "type-34",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3973,7 +3973,7 @@
    "referenced_type" : "type-125",
    "self_type" : "type-124",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -3982,7 +3982,7 @@
    "referenced_type" : "type-37",
    "self_type" : "type-36",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   }
  ]
 }
diff --git a/29/64/x86_x86_64/source-based/libbase.so.lsdump b/29/64/x86_x86_64/source-based/libbase.so.lsdump
index 9e0bea27..689f1f36 100644
--- a/29/64/x86_x86_64/source-based/libbase.so.lsdump
+++ b/29/64/x86_x86_64/source-based/libbase.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-9",
    "size" : 1024,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   }
  ],
  "builtin_types" :
@@ -593,7 +593,7 @@
    "referenced_type" : "type-30",
    "self_type" : "type-30",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "type-31",
    "unique_id" : "_ZTSN7android4base5LogIdE"
   },
@@ -635,7 +635,7 @@
    "referenced_type" : "type-51",
    "self_type" : "type-51",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "type-31",
    "unique_id" : "_ZTSN7android4base11LogSeverityE"
   }
@@ -658,7 +658,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -671,7 +671,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -684,7 +684,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -697,7 +697,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -710,7 +710,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "CapturedStdFd::str",
@@ -723,7 +723,7 @@
     }
    ],
    "return_type" : "type-223",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Stop",
@@ -736,7 +736,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Reset",
@@ -749,7 +749,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Start",
@@ -762,7 +762,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -778,7 +778,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -794,7 +794,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -807,7 +807,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -820,7 +820,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "access" : "private",
@@ -837,7 +837,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::release",
@@ -850,7 +850,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -866,7 +866,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -879,7 +879,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -895,7 +895,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -908,7 +908,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -921,7 +921,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -934,7 +934,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::LogMessage::stream",
@@ -947,7 +947,7 @@
     }
    ],
    "return_type" : "type-47",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogLine",
@@ -974,7 +974,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -1005,7 +1005,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -1036,7 +1036,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -1049,7 +1049,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -1062,7 +1062,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -1079,7 +1079,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -1096,7 +1096,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::operator()",
@@ -1127,7 +1127,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromFd",
@@ -1148,7 +1148,7 @@
     }
    ],
    "return_type" : "type-224",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -1161,7 +1161,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -1174,7 +1174,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::SetAborter",
@@ -1186,7 +1186,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -1201,7 +1201,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -1216,7 +1216,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::WriteFully",
@@ -1234,13 +1234,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::boot_clock::now",
    "linker_set_key" : "_ZN7android4base10boot_clock3nowEv",
    "return_type" : "type-228",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "function_name" : "android::base::GetProperty",
@@ -1255,13 +1255,13 @@
     }
    ],
    "return_type" : "type-229",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::GetThreadId",
    "linker_set_key" : "_ZN7android4base11GetThreadIdEv",
    "return_type" : "type-71",
-   "source_file" : "/system/core/base/include/android-base/threads.h"
+   "source_file" : "/system/libbase/include/android-base/threads.h"
   },
   {
    "function_name" : "android::base::InitLogging",
@@ -1281,7 +1281,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetProperty",
@@ -1296,7 +1296,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::StdioLogger",
@@ -1323,7 +1323,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::KernelLogger",
@@ -1350,7 +1350,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StderrLogger",
@@ -1377,7 +1377,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringPrintf",
@@ -1389,13 +1389,13 @@
     }
    ],
    "return_type" : "type-230",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::GetDefaultTag",
    "linker_set_key" : "_ZN7android4base13GetDefaultTagEv",
    "return_type" : "type-231",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetDefaultTag",
@@ -1407,7 +1407,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringAppendF",
@@ -1422,7 +1422,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringAppendV",
@@ -1440,7 +1440,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::DefaultAborter",
@@ -1452,7 +1452,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ReadFdToString",
@@ -1467,7 +1467,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetBoolProperty",
@@ -1482,7 +1482,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::ParseNetAddress",
@@ -1506,7 +1506,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "function_name" : "android::base::WaitForProperty",
@@ -1525,7 +1525,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::WriteStringToFd",
@@ -1540,7 +1540,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EqualsIgnoreCase",
@@ -1555,7 +1555,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::ReadFileToString",
@@ -1574,13 +1574,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetExecutablePath",
    "linker_set_key" : "_ZN7android4base17GetExecutablePathEv",
    "return_type" : "type-235",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ReadFullyAtOffset",
@@ -1601,7 +1601,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -1617,7 +1617,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -1633,7 +1633,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -1646,7 +1646,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -1659,7 +1659,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -1678,7 +1678,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -1706,7 +1706,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWithIgnoreCase",
@@ -1721,7 +1721,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::RemoveFileIfExists",
@@ -1737,7 +1737,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::StartsWithIgnoreCase",
@@ -1752,13 +1752,13 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::GetMinimumLogSeverity",
    "linker_set_key" : "_ZN7android4base21GetMinimumLogSeverityEv",
    "return_type" : "type-51",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetMinimumLogSeverity",
@@ -1770,13 +1770,13 @@
     }
    ],
    "return_type" : "type-51",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::GetExecutableDirectory",
    "linker_set_key" : "_ZN7android4base22GetExecutableDirectoryEv",
    "return_type" : "type-240",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SystemErrorCodeToString",
@@ -1788,7 +1788,7 @@
     }
    ],
    "return_type" : "type-241",
-   "source_file" : "/system/core/base/include/android-base/errors.h"
+   "source_file" : "/system/libbase/include/android-base/errors.h"
   },
   {
    "function_name" : "android::base::WaitForPropertyCreation",
@@ -1804,7 +1804,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::SendFileDescriptorVector",
@@ -1825,7 +1825,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::ReceiveFileDescriptorVector",
@@ -1849,7 +1849,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::Join",
@@ -1864,7 +1864,7 @@
     }
    ],
    "return_type" : "type-243",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-244", "type-148" ]
   },
   {
@@ -1880,7 +1880,7 @@
     }
    ],
    "return_type" : "type-245",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-246", "type-10" ]
   },
   {
@@ -1896,7 +1896,7 @@
     }
    ],
    "return_type" : "type-247",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-248", "type-148" ]
   },
   {
@@ -1912,7 +1912,7 @@
     }
    ],
    "return_type" : "type-249",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "type-250", "type-10" ]
   },
   {
@@ -1925,7 +1925,7 @@
     }
    ],
    "return_type" : "type-251",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Split",
@@ -1940,7 +1940,7 @@
     }
    ],
    "return_type" : "type-252",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Dirname",
@@ -1952,7 +1952,7 @@
     }
    ],
    "return_type" : "type-253",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Basename",
@@ -1964,7 +1964,7 @@
     }
    ],
    "return_type" : "type-254",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -1979,7 +1979,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -1994,7 +1994,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Readlink",
@@ -2009,7 +2009,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Realpath",
@@ -2024,7 +2024,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ParseUint",
@@ -2047,7 +2047,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-185" ]
   },
   {
@@ -2071,7 +2071,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-31" ]
   },
   {
@@ -2095,7 +2095,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-64" ]
   },
   {
@@ -2119,7 +2119,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "type-71" ]
   },
   {
@@ -2138,7 +2138,7 @@
     }
    ],
    "return_type" : "type-11",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SetLogger",
@@ -2150,7 +2150,7 @@
     }
    ],
    "return_type" : "type-56",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::operator<<",
@@ -2165,7 +2165,7 @@
     }
    ],
    "return_type" : "type-219",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -2179,7 +2179,7 @@
     }
    ],
    "return_type" : "type-8",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   }
  ],
  "global_vars" : [],
@@ -2192,7 +2192,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-65",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2201,7 +2201,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-118",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2210,7 +2210,7 @@
    "referenced_type" : "type-120",
    "self_type" : "type-119",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2219,7 +2219,7 @@
    "referenced_type" : "type-13",
    "self_type" : "type-23",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2228,7 +2228,7 @@
    "referenced_type" : "type-134",
    "self_type" : "type-136",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2237,7 +2237,7 @@
    "referenced_type" : "type-140",
    "self_type" : "type-142",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -2246,7 +2246,7 @@
    "referenced_type" : "type-146",
    "self_type" : "type-148",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2255,7 +2255,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2264,7 +2264,7 @@
    "referenced_type" : "type-58",
    "self_type" : "type-60",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2273,7 +2273,7 @@
    "referenced_type" : "type-74",
    "self_type" : "type-79",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -2282,7 +2282,7 @@
    "referenced_type" : "type-153",
    "self_type" : "type-155",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2291,7 +2291,7 @@
    "referenced_type" : "type-82",
    "self_type" : "type-91",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2300,7 +2300,7 @@
    "referenced_type" : "type-86",
    "self_type" : "type-88",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2309,7 +2309,7 @@
    "referenced_type" : "type-149",
    "self_type" : "type-152",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -2318,7 +2318,7 @@
    "referenced_type" : "type-108",
    "self_type" : "type-107",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2327,7 +2327,7 @@
    "referenced_type" : "type-131",
    "self_type" : "type-130",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2336,7 +2336,7 @@
    "referenced_type" : "type-176",
    "self_type" : "type-175",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2345,7 +2345,7 @@
    "referenced_type" : "type-210",
    "self_type" : "type-209",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2354,7 +2354,7 @@
    "referenced_type" : "type-220",
    "self_type" : "type-219",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2363,7 +2363,7 @@
    "referenced_type" : "type-48",
    "self_type" : "type-47",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2372,7 +2372,7 @@
    "referenced_type" : "type-5",
    "self_type" : "type-4",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2381,7 +2381,7 @@
    "referenced_type" : "type-81",
    "self_type" : "type-80",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2390,7 +2390,7 @@
    "referenced_type" : "type-97",
    "self_type" : "type-96",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   }
  ],
  "pointer_types" :
@@ -2402,7 +2402,7 @@
    "referenced_type" : "type-157",
    "self_type" : "type-158",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2411,7 +2411,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-163",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2420,7 +2420,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-165",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2429,7 +2429,7 @@
    "referenced_type" : "type-117",
    "self_type" : "type-116",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2438,7 +2438,7 @@
    "referenced_type" : "type-22",
    "self_type" : "type-21",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2447,7 +2447,7 @@
    "referenced_type" : "type-40",
    "self_type" : "type-39",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2456,7 +2456,7 @@
    "referenced_type" : "type-85",
    "self_type" : "type-84",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2465,7 +2465,7 @@
    "referenced_type" : "type-217",
    "self_type" : "type-218",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2474,7 +2474,7 @@
    "referenced_type" : "type-7",
    "self_type" : "type-6",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2483,7 +2483,7 @@
    "referenced_type" : "type-102",
    "self_type" : "type-101",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2492,7 +2492,7 @@
    "referenced_type" : "type-115",
    "self_type" : "type-114",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2501,7 +2501,7 @@
    "referenced_type" : "type-20",
    "self_type" : "type-19",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2510,7 +2510,7 @@
    "referenced_type" : "type-216",
    "self_type" : "type-215",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2519,7 +2519,7 @@
    "referenced_type" : "type-177",
    "self_type" : "type-181",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2528,7 +2528,7 @@
    "referenced_type" : "type-166",
    "self_type" : "type-171",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2537,7 +2537,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-160",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2546,7 +2546,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-151",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2555,7 +2555,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-198",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2564,7 +2564,7 @@
    "referenced_type" : "type-199",
    "self_type" : "type-202",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2573,7 +2573,7 @@
    "referenced_type" : "type-182",
    "self_type" : "type-186",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2582,7 +2582,7 @@
    "referenced_type" : "type-187",
    "self_type" : "type-189",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2591,7 +2591,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-170",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2600,7 +2600,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-168",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2609,7 +2609,7 @@
    "referenced_type" : "type-204",
    "self_type" : "type-205",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2618,7 +2618,7 @@
    "referenced_type" : "type-206",
    "self_type" : "type-207",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2627,7 +2627,7 @@
    "referenced_type" : "type-190",
    "self_type" : "type-191",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2636,7 +2636,7 @@
    "referenced_type" : "type-192",
    "self_type" : "type-193",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2645,7 +2645,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-126",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2654,7 +2654,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-43",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2663,7 +2663,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-28",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2672,7 +2672,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-57",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -2681,7 +2681,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-49",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2690,7 +2690,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-203",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2699,7 +2699,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-201",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2708,7 +2708,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-33",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2717,7 +2717,7 @@
    "referenced_type" : "type-33",
    "self_type" : "type-32",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2726,7 +2726,7 @@
    "referenced_type" : "type-159",
    "self_type" : "type-161",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -2735,7 +2735,7 @@
    "referenced_type" : "type-129",
    "self_type" : "type-133",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2744,7 +2744,7 @@
    "referenced_type" : "type-66",
    "self_type" : "type-211",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -2753,7 +2753,7 @@
    "referenced_type" : "type-15",
    "self_type" : "type-18",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2762,7 +2762,7 @@
    "referenced_type" : "type-24",
    "self_type" : "type-38",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -2771,7 +2771,7 @@
    "referenced_type" : "type-196",
    "self_type" : "type-195",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2780,7 +2780,7 @@
    "referenced_type" : "type-112",
    "self_type" : "type-111",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2789,7 +2789,7 @@
    "referenced_type" : "type-120",
    "self_type" : "type-132",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2798,7 +2798,7 @@
    "referenced_type" : "type-13",
    "self_type" : "type-12",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2807,7 +2807,7 @@
    "referenced_type" : "type-178",
    "self_type" : "type-180",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2816,7 +2816,7 @@
    "referenced_type" : "type-212",
    "self_type" : "type-214",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2825,7 +2825,7 @@
    "referenced_type" : "type-26",
    "self_type" : "type-52",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2834,7 +2834,7 @@
    "referenced_type" : "type-98",
    "self_type" : "type-100",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2843,7 +2843,7 @@
    "referenced_type" : "type-184",
    "self_type" : "type-183",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2852,7 +2852,7 @@
    "referenced_type" : "type-55",
    "self_type" : "type-69",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2861,7 +2861,7 @@
    "referenced_type" : "type-8",
    "self_type" : "type-53",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2870,7 +2870,7 @@
    "referenced_type" : "type-78",
    "self_type" : "type-77",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2879,7 +2879,7 @@
    "referenced_type" : "type-73",
    "self_type" : "type-76",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2888,7 +2888,7 @@
    "referenced_type" : "type-197",
    "self_type" : "type-200",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2897,7 +2897,7 @@
    "referenced_type" : "type-104",
    "self_type" : "type-103",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2906,7 +2906,7 @@
    "referenced_type" : "type-138",
    "self_type" : "type-137",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2915,7 +2915,7 @@
    "referenced_type" : "type-145",
    "self_type" : "type-144",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "alignment" : 4,
@@ -2924,7 +2924,7 @@
    "referenced_type" : "type-222",
    "self_type" : "type-221",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -2933,7 +2933,7 @@
    "referenced_type" : "type-62",
    "self_type" : "type-61",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -2942,7 +2942,7 @@
    "referenced_type" : "type-90",
    "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2951,7 +2951,7 @@
    "referenced_type" : "type-93",
    "self_type" : "type-92",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -2960,7 +2960,7 @@
    "referenced_type" : "type-185",
    "self_type" : "type-188",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -2969,7 +2969,7 @@
    "referenced_type" : "type-31",
    "self_type" : "type-70",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2978,7 +2978,7 @@
    "referenced_type" : "type-71",
    "self_type" : "type-72",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2987,7 +2987,7 @@
    "referenced_type" : "type-64",
    "self_type" : "type-63",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -2996,7 +2996,7 @@
    "referenced_type" : "type-56",
    "self_type" : "type-172",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   }
  ],
  "qualified_types" :
@@ -3009,7 +3009,7 @@
    "referenced_type" : "type-157",
    "self_type" : "type-159",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -3019,7 +3019,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-129",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3029,7 +3029,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-66",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -3039,7 +3039,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-15",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -3049,7 +3049,7 @@
    "referenced_type" : "type-11",
    "self_type" : "type-139",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -3059,7 +3059,7 @@
    "referenced_type" : "type-10",
    "self_type" : "type-24",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -3069,7 +3069,7 @@
    "referenced_type" : "type-8",
    "self_type" : "type-110",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -3079,7 +3079,7 @@
    "referenced_type" : "type-197",
    "self_type" : "type-196",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3089,7 +3089,7 @@
    "referenced_type" : "type-113",
    "self_type" : "type-112",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3099,7 +3099,7 @@
    "referenced_type" : "type-121",
    "self_type" : "type-120",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3109,7 +3109,7 @@
    "referenced_type" : "type-135",
    "self_type" : "type-134",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3119,7 +3119,7 @@
    "referenced_type" : "type-141",
    "self_type" : "type-140",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -3129,7 +3129,7 @@
    "referenced_type" : "type-147",
    "self_type" : "type-146",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3139,7 +3139,7 @@
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -3149,7 +3149,7 @@
    "referenced_type" : "type-179",
    "self_type" : "type-178",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3159,7 +3159,7 @@
    "referenced_type" : "type-213",
    "self_type" : "type-212",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3169,7 +3169,7 @@
    "referenced_type" : "type-27",
    "self_type" : "type-26",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3179,7 +3179,7 @@
    "referenced_type" : "type-59",
    "self_type" : "type-58",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
@@ -3189,7 +3189,7 @@
    "referenced_type" : "type-75",
    "self_type" : "type-74",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -3199,7 +3199,7 @@
    "referenced_type" : "type-99",
    "self_type" : "type-98",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3209,7 +3209,7 @@
    "referenced_type" : "type-106",
    "self_type" : "type-105",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3219,7 +3219,7 @@
    "referenced_type" : "type-128",
    "self_type" : "type-127",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3229,7 +3229,7 @@
    "referenced_type" : "type-174",
    "self_type" : "type-173",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3239,7 +3239,7 @@
    "referenced_type" : "type-3",
    "self_type" : "type-2",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3249,7 +3249,7 @@
    "referenced_type" : "type-42",
    "self_type" : "type-41",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3259,7 +3259,7 @@
    "referenced_type" : "type-46",
    "self_type" : "type-45",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3269,7 +3269,7 @@
    "referenced_type" : "type-95",
    "self_type" : "type-94",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3279,7 +3279,7 @@
    "referenced_type" : "type-154",
    "self_type" : "type-153",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -3289,7 +3289,7 @@
    "referenced_type" : "type-83",
    "self_type" : "type-82",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3299,7 +3299,7 @@
    "referenced_type" : "type-87",
    "self_type" : "type-86",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -3309,7 +3309,7 @@
    "referenced_type" : "type-150",
    "self_type" : "type-149",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 1,
@@ -3319,7 +3319,7 @@
    "referenced_type" : "type-185",
    "self_type" : "type-184",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "is_const" : true,
@@ -3327,7 +3327,7 @@
    "name" : "const void",
    "referenced_type" : "type-56",
    "self_type" : "type-55",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   }
  ],
  "record_types" :
@@ -3360,7 +3360,7 @@
    "referenced_type" : "type-157",
    "self_type" : "type-157",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS13CapturedStdFd"
   },
   {
@@ -3377,7 +3377,7 @@
    "referenced_type" : "type-162",
    "self_type" : "type-162",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS14CapturedStderr"
   },
   {
@@ -3394,7 +3394,7 @@
    "referenced_type" : "type-164",
    "self_type" : "type-164",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h",
+   "source_file" : "/system/libbase/include/android-base/test_utils.h",
    "unique_id" : "_ZTS14CapturedStdout"
   },
   {
@@ -3418,7 +3418,7 @@
    "referenced_type" : "type-217",
    "self_type" : "type-217",
    "size" : 1025,
-   "source_file" : "/system/core/base/include/android-base/file.h",
+   "source_file" : "/system/libbase/include/android-base/file.h",
    "unique_id" : "_ZTS12TemporaryDir"
   },
   {
@@ -3447,7 +3447,7 @@
    "referenced_type" : "type-7",
    "self_type" : "type-7",
    "size" : 1032,
-   "source_file" : "/system/core/base/include/android-base/file.h",
+   "source_file" : "/system/libbase/include/android-base/file.h",
    "unique_id" : "_ZTS13TemporaryFile"
   },
   {
@@ -3457,7 +3457,7 @@
    "referenced_type" : "type-17",
    "self_type" : "type-17",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -3479,7 +3479,7 @@
    "referenced_type" : "type-177",
    "self_type" : "type-177",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-33", "type-33" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
   },
@@ -3502,7 +3502,7 @@
    "referenced_type" : "type-166",
    "self_type" : "type-166",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-33", "type-38" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
   },
@@ -3525,7 +3525,7 @@
    "referenced_type" : "type-156",
    "self_type" : "type-156",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-38", "type-33" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
   },
@@ -3548,7 +3548,7 @@
    "referenced_type" : "type-143",
    "self_type" : "type-143",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-38", "type-38" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
   },
@@ -3571,7 +3571,7 @@
    "referenced_type" : "type-194",
    "self_type" : "type-194",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-195", "type-195" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
@@ -3594,7 +3594,7 @@
    "referenced_type" : "type-199",
    "self_type" : "type-199",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-195", "type-200" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
@@ -3617,7 +3617,7 @@
    "referenced_type" : "type-182",
    "self_type" : "type-182",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-183", "type-183" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
   },
@@ -3640,7 +3640,7 @@
    "referenced_type" : "type-187",
    "self_type" : "type-187",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-183", "type-188" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
   },
@@ -3663,7 +3663,7 @@
    "referenced_type" : "type-169",
    "self_type" : "type-169",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-8", "type-8" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIiiEE"
   },
@@ -3686,7 +3686,7 @@
    "referenced_type" : "type-167",
    "self_type" : "type-167",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-8", "type-78" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIixEE"
   },
@@ -3709,7 +3709,7 @@
    "referenced_type" : "type-204",
    "self_type" : "type-204",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-200", "type-195" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
@@ -3732,7 +3732,7 @@
    "referenced_type" : "type-206",
    "self_type" : "type-206",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-200", "type-200" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
@@ -3755,7 +3755,7 @@
    "referenced_type" : "type-190",
    "self_type" : "type-190",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-188", "type-183" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
   },
@@ -3778,7 +3778,7 @@
    "referenced_type" : "type-192",
    "self_type" : "type-192",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "type-188", "type-188" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
   },
@@ -3798,7 +3798,7 @@
    "referenced_type" : "type-109",
    "self_type" : "type-109",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
   },
   {
@@ -3817,7 +3817,7 @@
    "referenced_type" : "type-44",
    "self_type" : "type-44",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
   },
   {
@@ -3836,7 +3836,7 @@
    "referenced_type" : "type-29",
    "self_type" : "type-29",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
   },
   {
@@ -3867,7 +3867,7 @@
    "referenced_type" : "type-54",
    "self_type" : "type-54",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h",
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h",
    "unique_id" : "_ZTSN7android4base10MappedFileE"
   },
   {
@@ -3886,7 +3886,7 @@
    "referenced_type" : "type-50",
    "self_type" : "type-50",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
   },
   {
@@ -3905,7 +3905,7 @@
    "referenced_type" : "type-67",
    "self_type" : "type-67",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h",
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h",
    "unique_id" : "_ZTSN7android4base5TimerE"
   },
   {
@@ -3916,7 +3916,7 @@
    "referenced_type" : "type-1",
    "self_type" : "type-1",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h",
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h",
    "unique_id" : "_ZTSN7android4base10boot_clockE"
   },
   {
@@ -3935,7 +3935,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-16",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "template_args" : [ "type-17" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   }
@@ -3949,7 +3949,7 @@
    "referenced_type" : "type-16",
    "self_type" : "type-208",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -3958,7 +3958,7 @@
    "referenced_type" : "type-123",
    "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3967,7 +3967,7 @@
    "referenced_type" : "type-35",
    "self_type" : "type-34",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3976,7 +3976,7 @@
    "referenced_type" : "type-125",
    "self_type" : "type-124",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -3985,7 +3985,7 @@
    "referenced_type" : "type-37",
    "self_type" : "type-36",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   }
  ]
 }
diff --git a/30/32/arm_armv7-a-neon/source-based/libbase.so.lsdump b/30/32/arm_armv7-a-neon/source-based/libbase.so.lsdump
index 3a94f71a..a2765733 100644
--- a/30/32/arm_armv7-a-neon/source-based/libbase.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/libbase.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA1024_c",
    "size" : 1024,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -224,7 +224,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA92_c",
    "size" : 92,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "linker_set_key" : "_ZTIA_c",
@@ -1783,7 +1783,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1808,7 +1808,7 @@
    "referenced_type" : "_ZTIN7android4base15ParseBoolResultE",
    "self_type" : "_ZTIN7android4base15ParseBoolResultE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsebool.h",
+   "source_file" : "/system/libbase/include/android-base/parsebool.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -1841,7 +1841,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -2200,7 +2200,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -2213,7 +2213,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -2226,7 +2226,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -2239,7 +2239,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -2252,7 +2252,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "CapturedStdFd::str",
@@ -2265,7 +2265,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Stop",
@@ -2278,7 +2278,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Reset",
@@ -2291,7 +2291,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Start",
@@ -2304,7 +2304,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -2320,7 +2320,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -2336,7 +2336,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -2349,7 +2349,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -2362,7 +2362,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "access" : "private",
@@ -2379,7 +2379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::release",
@@ -2392,7 +2392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2408,7 +2408,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2421,7 +2421,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2437,7 +2437,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2450,7 +2450,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -2463,7 +2463,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -2476,7 +2476,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "fmt::v6::format_error::~format_error",
@@ -3284,8 +3284,8 @@
      "referenced_type" : "_ZTIPN7android4base10LogMessageE"
     }
    ],
-   "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/logging.sdump",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/logging.sdump",
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogLine",
@@ -3309,7 +3309,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3337,7 +3337,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3368,7 +3368,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3396,7 +3396,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3427,7 +3427,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -3440,7 +3440,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -3453,7 +3453,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -3470,7 +3470,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -3487,7 +3487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::operator()",
@@ -3518,7 +3518,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromOsHandle",
@@ -3539,7 +3539,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__110unique_ptrIN7android4base10MappedFileENS_14default_deleteIS3_EEEE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "access" : "private",
@@ -3553,7 +3553,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromFd",
@@ -3574,7 +3574,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__110unique_ptrIN7android4base10MappedFileENS_14default_deleteIS3_EEEE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::MappedFile",
@@ -3590,7 +3590,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::MappedFile",
@@ -3606,7 +3606,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -3619,7 +3619,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -3632,7 +3632,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::operator=",
@@ -3648,7 +3648,7 @@
     }
    ],
    "return_type" : "_ZTIRN7android4base10MappedFileE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::SetAborter",
@@ -3660,7 +3660,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -3675,7 +3675,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -3690,7 +3690,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::WriteFully",
@@ -3708,13 +3708,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::boot_clock::now",
    "linker_set_key" : "_ZN7android4base10boot_clock3nowEv",
    "return_type" : "_ZTINSt3__16chrono10time_pointIN7android4base10boot_clockENS0_8durationIxNS_5ratioILx1ELx1000000000EEEEEEE",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "function_name" : "android::base::GetProperty",
@@ -3722,20 +3722,20 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::GetThreadId",
    "linker_set_key" : "_ZN7android4base11GetThreadIdEv",
    "return_type" : "_ZTIy",
-   "source_file" : "/system/core/base/include/android-base/threads.h"
+   "source_file" : "/system/libbase/include/android-base/threads.h"
   },
   {
    "function_name" : "android::base::InitLogging",
@@ -3755,7 +3755,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetProperty",
@@ -3763,14 +3763,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::StdioLogger",
@@ -3797,7 +3797,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::KernelLogger",
@@ -3824,7 +3824,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StderrLogger",
@@ -3851,7 +3851,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringPrintf",
@@ -3863,7 +3863,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::SetDefaultTag",
@@ -3871,11 +3871,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/logging.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/logging.sdump"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringAppendF",
@@ -3883,14 +3883,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/stringprintf.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/stringprintf.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringAppendV",
@@ -3898,7 +3898,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/stringprintf.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/stringprintf.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -3908,7 +3908,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringReplace",
@@ -3929,7 +3929,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::CachedProperty::Get",
@@ -3946,7 +3946,7 @@
     }
    ],
    "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
@@ -3962,7 +3962,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
@@ -3978,7 +3978,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::DefaultAborter",
@@ -3990,7 +3990,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ReadFdToString",
@@ -4005,7 +4005,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetBoolProperty",
@@ -4013,14 +4013,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump"
     },
     {
      "referenced_type" : "_ZTIb"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::ParseNetAddress",
@@ -4028,23 +4028,23 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
      "referenced_type" : "_ZTIPi"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/parsenetaddress.sdump"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "function_name" : "android::base::WaitForProperty",
@@ -4052,10 +4052,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump"
     },
     {
      "default_arg" : true,
@@ -4063,7 +4063,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::WriteStringToFd",
@@ -4078,7 +4078,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EqualsIgnoreCase",
@@ -4093,7 +4093,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::ReadFileToString",
@@ -4112,13 +4112,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetExecutablePath",
    "linker_set_key" : "_ZN7android4base17GetExecutablePathEv",
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ReadFullyAtOffset",
@@ -4139,7 +4139,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -4155,7 +4155,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -4171,7 +4171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -4184,7 +4184,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -4197,7 +4197,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -4216,7 +4216,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -4244,7 +4244,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWithIgnoreCase",
@@ -4259,7 +4259,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::RemoveFileIfExists",
@@ -4275,7 +4275,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::StartsWithIgnoreCase",
@@ -4290,13 +4290,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::GetMinimumLogSeverity",
    "linker_set_key" : "_ZN7android4base21GetMinimumLogSeverityEv",
    "return_type" : "_ZTIN7android4base11LogSeverityE",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetMinimumLogSeverity",
@@ -4308,13 +4308,13 @@
     }
    ],
    "return_type" : "_ZTIN7android4base11LogSeverityE",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::GetExecutableDirectory",
    "linker_set_key" : "_ZN7android4base22GetExecutableDirectoryEv",
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SystemErrorCodeToString",
@@ -4326,7 +4326,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/errors.h"
+   "source_file" : "/system/libbase/include/android-base/errors.h"
   },
   {
    "function_name" : "android::base::WaitForPropertyCreation",
@@ -4334,7 +4334,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump"
     },
     {
      "default_arg" : true,
@@ -4342,7 +4342,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::SendFileDescriptorVector",
@@ -4363,7 +4363,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::ReceiveFileDescriptorVector",
@@ -4387,7 +4387,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::Join",
@@ -4398,15 +4398,15 @@
      "referenced_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
-    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump"
+    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump"
    ]
   },
   {
@@ -4422,7 +4422,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
@@ -4438,15 +4438,15 @@
      "referenced_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
-    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump"
+    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump"
    ]
   },
   {
@@ -4462,7 +4462,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE", "_ZTIc" ]
   },
   {
@@ -4471,11 +4471,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Split",
@@ -4483,14 +4483,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "access" : "private",
@@ -4504,7 +4504,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "function_name" : "android::base::Dirname",
@@ -4516,7 +4516,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Basename",
@@ -4528,7 +4528,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -4543,7 +4543,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -4558,7 +4558,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Readlink",
@@ -4573,7 +4573,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Realpath",
@@ -4588,7 +4588,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ParseBool",
@@ -4600,7 +4600,7 @@
     }
    ],
    "return_type" : "_ZTIN7android4base15ParseBoolResultE",
-   "source_file" : "/system/core/base/include/android-base/parsebool.h"
+   "source_file" : "/system/libbase/include/android-base/parsebool.h"
   },
   {
    "function_name" : "android::base::ParseUint",
@@ -4623,7 +4623,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIh" ]
   },
   {
@@ -4647,7 +4647,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIj" ]
   },
   {
@@ -4671,7 +4671,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIt" ]
   },
   {
@@ -4690,7 +4690,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SetLogger",
@@ -4702,7 +4702,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ShouldLog",
@@ -4717,7 +4717,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::operator<<",
@@ -4732,7 +4732,7 @@
     }
    ],
    "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -4746,7 +4746,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "fmt::v6::internal::locale_ref::get",
@@ -5063,7 +5063,7 @@
    "referenced_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIRKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5072,7 +5072,7 @@
    "referenced_type" : "_ZTIKN7android4base5TimerE",
    "self_type" : "_ZTIRKN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -5081,7 +5081,7 @@
    "referenced_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIRKN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -5096,46 +5096,46 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/file.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/file.sdump",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/logging.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/logging.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/logging.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/logging.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/parsenetaddress.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/parsenetaddress.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/parsenetaddress.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/parsenetaddress.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5162,7 +5162,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5171,7 +5171,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5180,7 +5180,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5189,7 +5189,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5198,7 +5198,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -5207,16 +5207,16 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/cmsg.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/cmsg.sdump",
+   "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/cmsg.sdump",
+   "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/cmsg.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -5774,7 +5774,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIRN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -5783,7 +5783,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIRN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -5792,7 +5792,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -5903,7 +5903,7 @@
    "referenced_type" : "_ZTI12TemporaryDir",
    "self_type" : "_ZTIP12TemporaryDir",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -5912,7 +5912,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTIP13CapturedStdFd",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5921,7 +5921,7 @@
    "referenced_type" : "_ZTI13TemporaryFile",
    "self_type" : "_ZTIP13TemporaryFile",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -5930,7 +5930,7 @@
    "referenced_type" : "_ZTI14CapturedStderr",
    "self_type" : "_ZTIP14CapturedStderr",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5939,7 +5939,7 @@
    "referenced_type" : "_ZTI14CapturedStdout",
    "self_type" : "_ZTIP14CapturedStdout",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5948,7 +5948,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5957,7 +5957,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5993,7 +5993,7 @@
    "referenced_type" : "_ZTIK13CapturedStdFd",
    "self_type" : "_ZTIPK13CapturedStdFd",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -6002,7 +6002,7 @@
    "referenced_type" : "_ZTIK9prop_info",
    "self_type" : "_ZTIPK9prop_info",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -6011,7 +6011,7 @@
    "referenced_type" : "_ZTIK9prop_info#ODR:",
    "self_type" : "_ZTIPK9prop_info#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -7532,7 +7532,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -7541,7 +7541,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7550,7 +7550,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -7559,7 +7559,7 @@
    "referenced_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7568,7 +7568,7 @@
    "referenced_type" : "_ZTIKN7android4base5TimerE",
    "self_type" : "_ZTIPKN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -7577,7 +7577,7 @@
    "referenced_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIPKN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -7586,7 +7586,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7595,43 +7595,43 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/cmsg.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/cmsg.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/cmsg.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/cmsg.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/file.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/file.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/file.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/file.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/logging.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/logging.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/logging.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/logging.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/test_utils.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/test_utils.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/test_utils.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/test_utils.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7640,7 +7640,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7649,7 +7649,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7658,7 +7658,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7676,7 +7676,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -8621,7 +8621,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIPN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8630,7 +8630,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIPN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8639,7 +8639,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -8648,7 +8648,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8657,7 +8657,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -8666,7 +8666,7 @@
    "referenced_type" : "_ZTIN7android4base14CachedPropertyE",
    "self_type" : "_ZTIPN7android4base14CachedPropertyE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -8675,7 +8675,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8684,7 +8684,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8693,7 +8693,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8702,7 +8702,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8711,7 +8711,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8720,7 +8720,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8729,7 +8729,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8738,7 +8738,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8747,7 +8747,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8756,7 +8756,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8765,7 +8765,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8774,7 +8774,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8783,7 +8783,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8792,7 +8792,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIixEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8801,7 +8801,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8810,7 +8810,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIPN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8819,7 +8819,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIPN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -8828,7 +8828,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIPN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -8837,7 +8837,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPidsE",
    "self_type" : "_ZTIPN7android4base7AllPidsE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -8846,7 +8846,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -8855,7 +8855,7 @@
    "referenced_type" : "_ZTINSt3__117basic_string_viewIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIPNSt3__117basic_string_viewIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -8864,7 +8864,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEEE",
    "self_type" : "_ZTIPNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -8873,7 +8873,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8882,7 +8882,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8891,7 +8891,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIPb",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -8900,7 +8900,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -8909,7 +8909,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8918,7 +8918,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8927,7 +8927,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8936,7 +8936,7 @@
    "referenced_type" : "_ZTIs",
    "self_type" : "_ZTIPs",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8945,7 +8945,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8954,7 +8954,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8972,7 +8972,7 @@
    "referenced_type" : "_ZTIx",
    "self_type" : "_ZTIPx",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8981,7 +8981,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIPy",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   }
  ],
  "qualified_types" :
@@ -9156,7 +9156,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTIK13CapturedStdFd",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "is_const" : true,
@@ -9164,7 +9164,7 @@
    "name" : "const prop_info",
    "referenced_type" : "_ZTI9prop_info",
    "self_type" : "_ZTIK9prop_info",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -10916,7 +10916,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -10926,7 +10926,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -10936,7 +10936,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -10946,7 +10946,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -10956,7 +10956,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIKN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -10966,7 +10966,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -10976,7 +10976,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -10986,7 +10986,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -11006,7 +11006,7 @@
    "referenced_type" : "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "self_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -11016,7 +11016,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "self_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -11026,7 +11026,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIiNS_9allocatorIiEEEE",
    "self_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 1,
@@ -11086,7 +11086,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -11096,7 +11096,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -11106,7 +11106,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -11136,7 +11136,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -11146,7 +11146,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -11164,7 +11164,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -11210,7 +11210,7 @@
    "referenced_type" : "_ZTI12TemporaryDir",
    "self_type" : "_ZTI12TemporaryDir",
    "size" : 1025,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -11240,7 +11240,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTI13CapturedStdFd",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -11268,7 +11268,7 @@
    "referenced_type" : "_ZTI13TemporaryFile",
    "self_type" : "_ZTI13TemporaryFile",
    "size" : 1032,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -11284,7 +11284,7 @@
    "referenced_type" : "_ZTI14CapturedStderr",
    "self_type" : "_ZTI14CapturedStderr",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -11300,7 +11300,7 @@
    "referenced_type" : "_ZTI14CapturedStdout",
    "self_type" : "_ZTI14CapturedStdout",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -19614,7 +19614,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -19632,7 +19632,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -19662,7 +19662,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 1,
@@ -19672,7 +19672,7 @@
    "referenced_type" : "_ZTIN7android4base10boot_clockE",
    "self_type" : "_ZTIN7android4base10boot_clockE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -19689,7 +19689,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -19698,7 +19698,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -19716,7 +19716,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -19770,7 +19770,7 @@
    "referenced_type" : "_ZTIN7android4base14CachedPropertyE",
    "self_type" : "_ZTIN7android4base14CachedPropertyE",
    "size" : 132,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -19791,7 +19791,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -19813,7 +19813,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -19835,7 +19835,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -19857,7 +19857,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -19879,7 +19879,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -19901,7 +19901,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -19923,7 +19923,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -19945,7 +19945,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -19967,7 +19967,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -19989,7 +19989,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -20011,7 +20011,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -20033,7 +20033,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -20055,7 +20055,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -20077,7 +20077,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIx" ]
   },
   {
@@ -20096,7 +20096,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -20115,7 +20115,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -20133,7 +20133,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -20158,7 +20158,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 1,
@@ -20168,7 +20168,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPidsE",
    "self_type" : "_ZTIN7android4base7AllPidsE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -21050,7 +21050,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTION7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -21059,7 +21059,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -21068,7 +21068,7 @@
    "referenced_type" : "_ZTINSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "self_type" : "_ZTIONSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -21077,7 +21077,7 @@
    "referenced_type" : "_ZTINSt3__18functionIFvPKcEEE",
    "self_type" : "_ZTIONSt3__18functionIFvPKcEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
diff --git a/30/32/x86/source-based/libbase.so.lsdump b/30/32/x86/source-based/libbase.so.lsdump
index 99d3688a..40b31fa4 100644
--- a/30/32/x86/source-based/libbase.so.lsdump
+++ b/30/32/x86/source-based/libbase.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA1024_c",
    "size" : 1024,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -224,7 +224,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA92_c",
    "size" : 92,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "linker_set_key" : "_ZTIA_c",
@@ -1777,7 +1777,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1802,7 +1802,7 @@
    "referenced_type" : "_ZTIN7android4base15ParseBoolResultE",
    "self_type" : "_ZTIN7android4base15ParseBoolResultE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsebool.h",
+   "source_file" : "/system/libbase/include/android-base/parsebool.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -1835,7 +1835,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -2194,7 +2194,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -2207,7 +2207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -2220,7 +2220,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -2233,7 +2233,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -2246,7 +2246,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "CapturedStdFd::str",
@@ -2259,7 +2259,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Stop",
@@ -2272,7 +2272,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Reset",
@@ -2285,7 +2285,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Start",
@@ -2298,7 +2298,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -2314,7 +2314,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -2330,7 +2330,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -2343,7 +2343,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -2356,7 +2356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "access" : "private",
@@ -2373,7 +2373,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::release",
@@ -2386,7 +2386,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2402,7 +2402,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2415,7 +2415,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2431,7 +2431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2444,7 +2444,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -2457,7 +2457,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -2470,7 +2470,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "fmt::v6::format_error::~format_error",
@@ -3262,8 +3262,8 @@
      "referenced_type" : "_ZTIPN7android4base10LogMessageE"
     }
    ],
-   "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/logging.sdump",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/logging.sdump",
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogLine",
@@ -3287,7 +3287,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3315,7 +3315,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3346,7 +3346,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3374,7 +3374,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3405,7 +3405,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -3418,7 +3418,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -3431,7 +3431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -3448,7 +3448,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -3465,7 +3465,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::operator()",
@@ -3496,7 +3496,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromOsHandle",
@@ -3517,7 +3517,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__110unique_ptrIN7android4base10MappedFileENS_14default_deleteIS3_EEEE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "access" : "private",
@@ -3531,7 +3531,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromFd",
@@ -3552,7 +3552,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__110unique_ptrIN7android4base10MappedFileENS_14default_deleteIS3_EEEE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::MappedFile",
@@ -3568,7 +3568,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::MappedFile",
@@ -3584,7 +3584,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -3597,7 +3597,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -3610,7 +3610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::operator=",
@@ -3626,7 +3626,7 @@
     }
    ],
    "return_type" : "_ZTIRN7android4base10MappedFileE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::SetAborter",
@@ -3638,7 +3638,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -3653,7 +3653,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -3668,7 +3668,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::WriteFully",
@@ -3686,13 +3686,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::boot_clock::now",
    "linker_set_key" : "_ZN7android4base10boot_clock3nowEv",
    "return_type" : "_ZTINSt3__16chrono10time_pointIN7android4base10boot_clockENS0_8durationIxNS_5ratioILx1ELx1000000000EEEEEEE",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "function_name" : "android::base::GetProperty",
@@ -3700,20 +3700,20 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::GetThreadId",
    "linker_set_key" : "_ZN7android4base11GetThreadIdEv",
    "return_type" : "_ZTIy",
-   "source_file" : "/system/core/base/include/android-base/threads.h"
+   "source_file" : "/system/libbase/include/android-base/threads.h"
   },
   {
    "function_name" : "android::base::InitLogging",
@@ -3733,7 +3733,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetProperty",
@@ -3741,14 +3741,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::StdioLogger",
@@ -3775,7 +3775,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::KernelLogger",
@@ -3802,7 +3802,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StderrLogger",
@@ -3829,7 +3829,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringPrintf",
@@ -3841,7 +3841,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::SetDefaultTag",
@@ -3849,11 +3849,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/logging.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/logging.sdump"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringAppendF",
@@ -3861,14 +3861,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/stringprintf.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/stringprintf.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringAppendV",
@@ -3876,7 +3876,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/stringprintf.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/stringprintf.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -3886,7 +3886,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringReplace",
@@ -3907,7 +3907,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::CachedProperty::Get",
@@ -3924,7 +3924,7 @@
     }
    ],
    "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
@@ -3940,7 +3940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
@@ -3956,7 +3956,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::DefaultAborter",
@@ -3968,7 +3968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ReadFdToString",
@@ -3983,7 +3983,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetBoolProperty",
@@ -3991,14 +3991,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump"
     },
     {
      "referenced_type" : "_ZTIb"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::ParseNetAddress",
@@ -4006,23 +4006,23 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
      "referenced_type" : "_ZTIPi"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/parsenetaddress.sdump"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "function_name" : "android::base::WaitForProperty",
@@ -4030,10 +4030,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump"
     },
     {
      "default_arg" : true,
@@ -4041,7 +4041,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::WriteStringToFd",
@@ -4056,7 +4056,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EqualsIgnoreCase",
@@ -4071,7 +4071,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::ReadFileToString",
@@ -4090,13 +4090,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetExecutablePath",
    "linker_set_key" : "_ZN7android4base17GetExecutablePathEv",
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ReadFullyAtOffset",
@@ -4117,7 +4117,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -4133,7 +4133,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -4149,7 +4149,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -4162,7 +4162,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -4175,7 +4175,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -4194,7 +4194,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -4222,7 +4222,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWithIgnoreCase",
@@ -4237,7 +4237,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::RemoveFileIfExists",
@@ -4253,7 +4253,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::StartsWithIgnoreCase",
@@ -4268,13 +4268,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::GetMinimumLogSeverity",
    "linker_set_key" : "_ZN7android4base21GetMinimumLogSeverityEv",
    "return_type" : "_ZTIN7android4base11LogSeverityE",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetMinimumLogSeverity",
@@ -4286,13 +4286,13 @@
     }
    ],
    "return_type" : "_ZTIN7android4base11LogSeverityE",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::GetExecutableDirectory",
    "linker_set_key" : "_ZN7android4base22GetExecutableDirectoryEv",
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SystemErrorCodeToString",
@@ -4304,7 +4304,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/errors.h"
+   "source_file" : "/system/libbase/include/android-base/errors.h"
   },
   {
    "function_name" : "android::base::WaitForPropertyCreation",
@@ -4312,7 +4312,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump"
     },
     {
      "default_arg" : true,
@@ -4320,7 +4320,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::SendFileDescriptorVector",
@@ -4341,7 +4341,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::ReceiveFileDescriptorVector",
@@ -4365,7 +4365,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::Join",
@@ -4376,15 +4376,15 @@
      "referenced_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
-    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump"
+    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump"
    ]
   },
   {
@@ -4400,7 +4400,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
@@ -4416,15 +4416,15 @@
      "referenced_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
-    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump"
+    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump"
    ]
   },
   {
@@ -4440,7 +4440,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE", "_ZTIc" ]
   },
   {
@@ -4449,11 +4449,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Split",
@@ -4461,14 +4461,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "access" : "private",
@@ -4482,7 +4482,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "function_name" : "android::base::Dirname",
@@ -4494,7 +4494,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Basename",
@@ -4506,7 +4506,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -4521,7 +4521,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -4536,7 +4536,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Readlink",
@@ -4551,7 +4551,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Realpath",
@@ -4566,7 +4566,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ParseBool",
@@ -4578,7 +4578,7 @@
     }
    ],
    "return_type" : "_ZTIN7android4base15ParseBoolResultE",
-   "source_file" : "/system/core/base/include/android-base/parsebool.h"
+   "source_file" : "/system/libbase/include/android-base/parsebool.h"
   },
   {
    "function_name" : "android::base::ParseUint",
@@ -4601,7 +4601,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIh" ]
   },
   {
@@ -4625,7 +4625,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIj" ]
   },
   {
@@ -4649,7 +4649,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIt" ]
   },
   {
@@ -4668,7 +4668,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SetLogger",
@@ -4680,7 +4680,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ShouldLog",
@@ -4695,7 +4695,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::operator<<",
@@ -4710,7 +4710,7 @@
     }
    ],
    "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -4724,7 +4724,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "fmt::v6::internal::locale_ref::get",
@@ -5041,7 +5041,7 @@
    "referenced_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIRKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5050,7 +5050,7 @@
    "referenced_type" : "_ZTIKN7android4base5TimerE",
    "self_type" : "_ZTIRKN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -5059,7 +5059,7 @@
    "referenced_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIRKN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -5074,46 +5074,46 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/file.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/file.sdump",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/logging.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/logging.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/logging.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/logging.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/parsenetaddress.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/parsenetaddress.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/parsenetaddress.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/parsenetaddress.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5140,7 +5140,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5149,7 +5149,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5158,7 +5158,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5167,7 +5167,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5176,7 +5176,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -5185,16 +5185,16 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/cmsg.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/cmsg.sdump",
+   "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/cmsg.sdump",
+   "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/cmsg.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -5752,7 +5752,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIRN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -5761,7 +5761,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIRN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -5770,7 +5770,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -5881,7 +5881,7 @@
    "referenced_type" : "_ZTI12TemporaryDir",
    "self_type" : "_ZTIP12TemporaryDir",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -5890,7 +5890,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTIP13CapturedStdFd",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5899,7 +5899,7 @@
    "referenced_type" : "_ZTI13TemporaryFile",
    "self_type" : "_ZTIP13TemporaryFile",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -5908,7 +5908,7 @@
    "referenced_type" : "_ZTI14CapturedStderr",
    "self_type" : "_ZTIP14CapturedStderr",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5917,7 +5917,7 @@
    "referenced_type" : "_ZTI14CapturedStdout",
    "self_type" : "_ZTIP14CapturedStdout",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5926,7 +5926,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5935,7 +5935,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5971,7 +5971,7 @@
    "referenced_type" : "_ZTIK13CapturedStdFd",
    "self_type" : "_ZTIPK13CapturedStdFd",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5980,7 +5980,7 @@
    "referenced_type" : "_ZTIK9prop_info",
    "self_type" : "_ZTIPK9prop_info",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -5989,7 +5989,7 @@
    "referenced_type" : "_ZTIK9prop_info#ODR:",
    "self_type" : "_ZTIPK9prop_info#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -7510,7 +7510,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -7519,7 +7519,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7528,7 +7528,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -7537,7 +7537,7 @@
    "referenced_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7546,7 +7546,7 @@
    "referenced_type" : "_ZTIKN7android4base5TimerE",
    "self_type" : "_ZTIPKN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -7555,7 +7555,7 @@
    "referenced_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIPKN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -7564,7 +7564,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7573,43 +7573,43 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/cmsg.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/cmsg.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/cmsg.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/cmsg.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/file.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/file.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/file.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/file.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/logging.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/logging.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/logging.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/logging.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/test_utils.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/test_utils.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/test_utils.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/test_utils.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7618,7 +7618,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7627,7 +7627,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7636,7 +7636,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7654,7 +7654,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -8599,7 +8599,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIPN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8608,7 +8608,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIPN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8617,7 +8617,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -8626,7 +8626,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8635,7 +8635,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -8644,7 +8644,7 @@
    "referenced_type" : "_ZTIN7android4base14CachedPropertyE",
    "self_type" : "_ZTIPN7android4base14CachedPropertyE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -8653,7 +8653,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8662,7 +8662,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8671,7 +8671,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8680,7 +8680,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8689,7 +8689,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8698,7 +8698,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8707,7 +8707,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8716,7 +8716,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8725,7 +8725,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8734,7 +8734,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8743,7 +8743,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8752,7 +8752,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8761,7 +8761,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8770,7 +8770,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIixEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8779,7 +8779,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8788,7 +8788,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIPN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8797,7 +8797,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIPN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -8806,7 +8806,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIPN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -8815,7 +8815,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPidsE",
    "self_type" : "_ZTIPN7android4base7AllPidsE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -8824,7 +8824,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -8833,7 +8833,7 @@
    "referenced_type" : "_ZTINSt3__117basic_string_viewIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIPNSt3__117basic_string_viewIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -8842,7 +8842,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEEE",
    "self_type" : "_ZTIPNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -8851,7 +8851,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8860,7 +8860,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8869,7 +8869,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIPb",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -8878,7 +8878,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -8887,7 +8887,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8896,7 +8896,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8905,7 +8905,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8914,7 +8914,7 @@
    "referenced_type" : "_ZTIs",
    "self_type" : "_ZTIPs",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8923,7 +8923,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8932,7 +8932,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8950,7 +8950,7 @@
    "referenced_type" : "_ZTIx",
    "self_type" : "_ZTIPx",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8959,7 +8959,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIPy",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   }
  ],
  "qualified_types" :
@@ -9134,7 +9134,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTIK13CapturedStdFd",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "is_const" : true,
@@ -9142,7 +9142,7 @@
    "name" : "const prop_info",
    "referenced_type" : "_ZTI9prop_info",
    "self_type" : "_ZTIK9prop_info",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -10894,7 +10894,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -10904,7 +10904,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -10914,7 +10914,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -10924,7 +10924,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -10934,7 +10934,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIKN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -10944,7 +10944,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -10954,7 +10954,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -10964,7 +10964,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -10984,7 +10984,7 @@
    "referenced_type" : "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "self_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -10994,7 +10994,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "self_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -11004,7 +11004,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIiNS_9allocatorIiEEEE",
    "self_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 1,
@@ -11064,7 +11064,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -11074,7 +11074,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -11084,7 +11084,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -11114,7 +11114,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -11124,7 +11124,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -11142,7 +11142,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -11188,7 +11188,7 @@
    "referenced_type" : "_ZTI12TemporaryDir",
    "self_type" : "_ZTI12TemporaryDir",
    "size" : 1025,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -11218,7 +11218,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTI13CapturedStdFd",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -11246,7 +11246,7 @@
    "referenced_type" : "_ZTI13TemporaryFile",
    "self_type" : "_ZTI13TemporaryFile",
    "size" : 1032,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -11262,7 +11262,7 @@
    "referenced_type" : "_ZTI14CapturedStderr",
    "self_type" : "_ZTI14CapturedStderr",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -11278,7 +11278,7 @@
    "referenced_type" : "_ZTI14CapturedStdout",
    "self_type" : "_ZTI14CapturedStdout",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -19592,7 +19592,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -19610,7 +19610,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -19640,7 +19640,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 1,
@@ -19650,7 +19650,7 @@
    "referenced_type" : "_ZTIN7android4base10boot_clockE",
    "self_type" : "_ZTIN7android4base10boot_clockE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -19667,7 +19667,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -19676,7 +19676,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -19694,7 +19694,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -19748,7 +19748,7 @@
    "referenced_type" : "_ZTIN7android4base14CachedPropertyE",
    "self_type" : "_ZTIN7android4base14CachedPropertyE",
    "size" : 132,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -19769,7 +19769,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -19791,7 +19791,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -19813,7 +19813,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -19835,7 +19835,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -19857,7 +19857,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -19879,7 +19879,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -19901,7 +19901,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -19923,7 +19923,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -19945,7 +19945,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -19967,7 +19967,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -19989,7 +19989,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -20011,7 +20011,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -20033,7 +20033,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -20055,7 +20055,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIx" ]
   },
   {
@@ -20074,7 +20074,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -20093,7 +20093,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -20111,7 +20111,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -20136,7 +20136,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 1,
@@ -20146,7 +20146,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPidsE",
    "self_type" : "_ZTIN7android4base7AllPidsE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -21028,7 +21028,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTION7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -21037,7 +21037,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -21046,7 +21046,7 @@
    "referenced_type" : "_ZTINSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "self_type" : "_ZTIONSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -21055,7 +21055,7 @@
    "referenced_type" : "_ZTINSt3__18functionIFvPKcEEE",
    "self_type" : "_ZTIONSt3__18functionIFvPKcEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
diff --git a/30/64/arm64_armv8-a/source-based/libbase.so.lsdump b/30/64/arm64_armv8-a/source-based/libbase.so.lsdump
index d3b81608..8364ccdb 100644
--- a/30/64/arm64_armv8-a/source-based/libbase.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/libbase.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA1024_c",
    "size" : 1024,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -224,7 +224,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA92_c",
    "size" : 92,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "linker_set_key" : "_ZTIA_c",
@@ -1862,7 +1862,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1887,7 +1887,7 @@
    "referenced_type" : "_ZTIN7android4base15ParseBoolResultE",
    "self_type" : "_ZTIN7android4base15ParseBoolResultE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsebool.h",
+   "source_file" : "/system/libbase/include/android-base/parsebool.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -1920,7 +1920,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -2381,7 +2381,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -2394,7 +2394,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -2407,7 +2407,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -2420,7 +2420,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -2433,7 +2433,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "CapturedStdFd::str",
@@ -2446,7 +2446,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Stop",
@@ -2459,7 +2459,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Reset",
@@ -2472,7 +2472,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Start",
@@ -2485,7 +2485,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -2501,7 +2501,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -2517,7 +2517,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -2530,7 +2530,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -2543,7 +2543,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "access" : "private",
@@ -2560,7 +2560,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::release",
@@ -2573,7 +2573,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2589,7 +2589,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2602,7 +2602,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2618,7 +2618,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2631,7 +2631,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -2644,7 +2644,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -2657,7 +2657,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "fmt::v6::format_error::~format_error",
@@ -3446,8 +3446,8 @@
      "referenced_type" : "_ZTIPN7android4base10LogMessageE"
     }
    ],
-   "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/logging.sdump",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/logging.sdump",
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogLine",
@@ -3471,7 +3471,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3499,7 +3499,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3530,7 +3530,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3558,7 +3558,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3589,7 +3589,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -3602,7 +3602,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -3615,7 +3615,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -3632,7 +3632,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -3649,7 +3649,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::operator()",
@@ -3680,7 +3680,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromOsHandle",
@@ -3701,7 +3701,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__110unique_ptrIN7android4base10MappedFileENS_14default_deleteIS3_EEEE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "access" : "private",
@@ -3715,7 +3715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromFd",
@@ -3736,7 +3736,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__110unique_ptrIN7android4base10MappedFileENS_14default_deleteIS3_EEEE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::MappedFile",
@@ -3752,7 +3752,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::MappedFile",
@@ -3768,7 +3768,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -3781,7 +3781,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -3794,7 +3794,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::operator=",
@@ -3810,7 +3810,7 @@
     }
    ],
    "return_type" : "_ZTIRN7android4base10MappedFileE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::SetAborter",
@@ -3822,7 +3822,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -3837,7 +3837,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -3852,7 +3852,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::WriteFully",
@@ -3870,13 +3870,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::boot_clock::now",
    "linker_set_key" : "_ZN7android4base10boot_clock3nowEv",
    "return_type" : "_ZTINSt3__16chrono10time_pointIN7android4base10boot_clockENS0_8durationIxNS_5ratioILl1ELl1000000000EEEEEEE",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "function_name" : "android::base::GetProperty",
@@ -3884,20 +3884,20 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/properties.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::GetThreadId",
    "linker_set_key" : "_ZN7android4base11GetThreadIdEv",
    "return_type" : "_ZTIm",
-   "source_file" : "/system/core/base/include/android-base/threads.h"
+   "source_file" : "/system/libbase/include/android-base/threads.h"
   },
   {
    "function_name" : "android::base::InitLogging",
@@ -3917,7 +3917,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetProperty",
@@ -3925,14 +3925,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/properties.sdump"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::StdioLogger",
@@ -3959,7 +3959,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::KernelLogger",
@@ -3986,7 +3986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StderrLogger",
@@ -4013,7 +4013,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringPrintf",
@@ -4025,7 +4025,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::SetDefaultTag",
@@ -4033,11 +4033,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/logging.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/logging.sdump"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringAppendF",
@@ -4045,14 +4045,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/stringprintf.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/stringprintf.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringAppendV",
@@ -4060,7 +4060,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/stringprintf.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/stringprintf.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -4070,7 +4070,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringReplace",
@@ -4091,7 +4091,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::CachedProperty::Get",
@@ -4108,7 +4108,7 @@
     }
    ],
    "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
@@ -4124,7 +4124,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
@@ -4140,7 +4140,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::DefaultAborter",
@@ -4152,7 +4152,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ReadFdToString",
@@ -4167,7 +4167,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetBoolProperty",
@@ -4175,14 +4175,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/properties.sdump"
     },
     {
      "referenced_type" : "_ZTIb"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::ParseNetAddress",
@@ -4190,23 +4190,23 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
      "referenced_type" : "_ZTIPi"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/parsenetaddress.sdump"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "function_name" : "android::base::WaitForProperty",
@@ -4214,10 +4214,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/properties.sdump"
     },
     {
      "default_arg" : true,
@@ -4225,7 +4225,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::WriteStringToFd",
@@ -4240,7 +4240,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EqualsIgnoreCase",
@@ -4255,7 +4255,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::ReadFileToString",
@@ -4274,13 +4274,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetExecutablePath",
    "linker_set_key" : "_ZN7android4base17GetExecutablePathEv",
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ReadFullyAtOffset",
@@ -4301,7 +4301,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -4317,7 +4317,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -4333,7 +4333,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -4346,7 +4346,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -4359,7 +4359,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -4378,7 +4378,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -4406,7 +4406,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWithIgnoreCase",
@@ -4421,7 +4421,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::RemoveFileIfExists",
@@ -4437,7 +4437,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::StartsWithIgnoreCase",
@@ -4452,13 +4452,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::GetMinimumLogSeverity",
    "linker_set_key" : "_ZN7android4base21GetMinimumLogSeverityEv",
    "return_type" : "_ZTIN7android4base11LogSeverityE",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetMinimumLogSeverity",
@@ -4470,13 +4470,13 @@
     }
    ],
    "return_type" : "_ZTIN7android4base11LogSeverityE",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::GetExecutableDirectory",
    "linker_set_key" : "_ZN7android4base22GetExecutableDirectoryEv",
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SystemErrorCodeToString",
@@ -4488,7 +4488,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/errors.h"
+   "source_file" : "/system/libbase/include/android-base/errors.h"
   },
   {
    "function_name" : "android::base::WaitForPropertyCreation",
@@ -4496,7 +4496,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/properties.sdump"
     },
     {
      "default_arg" : true,
@@ -4504,7 +4504,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::SendFileDescriptorVector",
@@ -4525,7 +4525,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::ReceiveFileDescriptorVector",
@@ -4549,7 +4549,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::Join",
@@ -4560,15 +4560,15 @@
      "referenced_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
-    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/strings.sdump"
+    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/strings.sdump"
    ]
   },
   {
@@ -4584,7 +4584,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
@@ -4600,15 +4600,15 @@
      "referenced_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
-    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/strings.sdump"
+    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/strings.sdump"
    ]
   },
   {
@@ -4624,7 +4624,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE", "_ZTIc" ]
   },
   {
@@ -4633,11 +4633,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Split",
@@ -4645,14 +4645,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/strings.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "access" : "private",
@@ -4666,7 +4666,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "function_name" : "android::base::Dirname",
@@ -4678,7 +4678,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Basename",
@@ -4690,7 +4690,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -4705,7 +4705,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -4720,7 +4720,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Readlink",
@@ -4735,7 +4735,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Realpath",
@@ -4750,7 +4750,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ParseBool",
@@ -4762,7 +4762,7 @@
     }
    ],
    "return_type" : "_ZTIN7android4base15ParseBoolResultE",
-   "source_file" : "/system/core/base/include/android-base/parsebool.h"
+   "source_file" : "/system/libbase/include/android-base/parsebool.h"
   },
   {
    "function_name" : "android::base::ParseUint",
@@ -4785,7 +4785,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIh" ]
   },
   {
@@ -4809,7 +4809,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIt" ]
   },
   {
@@ -4828,7 +4828,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SetLogger",
@@ -4840,7 +4840,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ShouldLog",
@@ -4855,7 +4855,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::operator<<",
@@ -4870,7 +4870,7 @@
     }
    ],
    "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -4884,7 +4884,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "fmt::v6::internal::locale_ref::get",
@@ -5201,7 +5201,7 @@
    "referenced_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIRKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -5210,7 +5210,7 @@
    "referenced_type" : "_ZTIKN7android4base5TimerE",
    "self_type" : "_ZTIRKN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -5219,7 +5219,7 @@
    "referenced_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIRKN7android4base7AllPids11PidIteratorE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 8,
@@ -5234,46 +5234,46 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/file.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/file.sdump",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/logging.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/logging.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/logging.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/logging.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/parsenetaddress.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/parsenetaddress.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/parsenetaddress.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/parsenetaddress.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/properties.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/properties.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/properties.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/properties.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/strings.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/strings.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/strings.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/strings.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -5300,7 +5300,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -5309,7 +5309,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -5318,7 +5318,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -5327,7 +5327,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -5336,7 +5336,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -5345,16 +5345,16 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/cmsg.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/cmsg.sdump",
+   "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/cmsg.sdump",
+   "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/cmsg.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -5939,7 +5939,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIRN7android4base10MappedFileE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -5948,7 +5948,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIRN7android4base7AllPids11PidIteratorE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 8,
@@ -5957,7 +5957,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -6068,7 +6068,7 @@
    "referenced_type" : "_ZTI12TemporaryDir",
    "self_type" : "_ZTIP12TemporaryDir",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -6077,7 +6077,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTIP13CapturedStdFd",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -6086,7 +6086,7 @@
    "referenced_type" : "_ZTI13TemporaryFile",
    "self_type" : "_ZTIP13TemporaryFile",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -6095,7 +6095,7 @@
    "referenced_type" : "_ZTI14CapturedStderr",
    "self_type" : "_ZTIP14CapturedStderr",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -6104,7 +6104,7 @@
    "referenced_type" : "_ZTI14CapturedStdout",
    "self_type" : "_ZTIP14CapturedStdout",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -6113,7 +6113,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -6122,7 +6122,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -6158,7 +6158,7 @@
    "referenced_type" : "_ZTIK13CapturedStdFd",
    "self_type" : "_ZTIPK13CapturedStdFd",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -6167,7 +6167,7 @@
    "referenced_type" : "_ZTIK9prop_info",
    "self_type" : "_ZTIPK9prop_info",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -6176,7 +6176,7 @@
    "referenced_type" : "_ZTIK9prop_info#ODR:",
    "self_type" : "_ZTIPK9prop_info#ODR:",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -8093,7 +8093,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -8102,7 +8102,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -8111,7 +8111,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -8120,7 +8120,7 @@
    "referenced_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -8129,7 +8129,7 @@
    "referenced_type" : "_ZTIKN7android4base5TimerE",
    "self_type" : "_ZTIPKN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -8138,7 +8138,7 @@
    "referenced_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIPKN7android4base7AllPids11PidIteratorE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 8,
@@ -8147,7 +8147,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -8156,43 +8156,43 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/cmsg.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/cmsg.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/cmsg.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/cmsg.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/file.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/file.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/file.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/file.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/logging.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/logging.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/logging.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/logging.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/test_utils.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/core/base/test_utils.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/test_utils.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm64_armv8-a_static/obj/system/libbase/test_utils.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -8201,7 +8201,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -8210,7 +8210,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -8219,7 +8219,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -8237,7 +8237,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -9218,7 +9218,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIPN7android4base10LogMessageE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9227,7 +9227,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIPN7android4base10LogdLoggerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9236,7 +9236,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -9245,7 +9245,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -9254,7 +9254,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -9263,7 +9263,7 @@
    "referenced_type" : "_ZTIN7android4base14CachedPropertyE",
    "self_type" : "_ZTIPN7android4base14CachedPropertyE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -9272,7 +9272,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9281,7 +9281,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9290,7 +9290,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9299,7 +9299,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9308,7 +9308,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9317,7 +9317,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9326,7 +9326,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9335,7 +9335,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9344,7 +9344,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9353,7 +9353,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9362,7 +9362,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9371,7 +9371,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9380,7 +9380,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9389,7 +9389,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIilEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIilEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9398,7 +9398,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -9407,7 +9407,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIPN7android4base17ScopedLogSeverityE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9416,7 +9416,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIPN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -9425,7 +9425,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIPN7android4base7AllPids11PidIteratorE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 8,
@@ -9434,7 +9434,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPidsE",
    "self_type" : "_ZTIPN7android4base7AllPidsE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 8,
@@ -9443,7 +9443,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -9452,7 +9452,7 @@
    "referenced_type" : "_ZTINSt3__117basic_string_viewIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIPNSt3__117basic_string_viewIcNS_11char_traitsIcEEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -9461,7 +9461,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEEE",
    "self_type" : "_ZTIPNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -9470,7 +9470,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9479,7 +9479,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9488,7 +9488,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIPb",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -9497,7 +9497,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -9506,7 +9506,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9515,7 +9515,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -9524,7 +9524,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -9533,7 +9533,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIPl",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -9542,7 +9542,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIPm",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -9551,7 +9551,7 @@
    "referenced_type" : "_ZTIs",
    "self_type" : "_ZTIPs",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -9560,7 +9560,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -9569,7 +9569,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -9753,7 +9753,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTIK13CapturedStdFd",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "is_const" : true,
@@ -9761,7 +9761,7 @@
    "name" : "const prop_info",
    "referenced_type" : "_ZTI9prop_info",
    "self_type" : "_ZTIK9prop_info",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -11953,7 +11953,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -11963,7 +11963,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -11973,7 +11973,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -11983,7 +11983,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -11993,7 +11993,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIKN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -12003,7 +12003,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 8,
@@ -12013,7 +12013,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -12023,7 +12023,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -12043,7 +12043,7 @@
    "referenced_type" : "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "self_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -12053,7 +12053,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "self_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -12063,7 +12063,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIiNS_9allocatorIiEEEE",
    "self_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 1,
@@ -12123,7 +12123,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -12133,7 +12133,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -12143,7 +12143,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -12163,7 +12163,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -12173,7 +12173,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -12201,7 +12201,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -12247,7 +12247,7 @@
    "referenced_type" : "_ZTI12TemporaryDir",
    "self_type" : "_ZTI12TemporaryDir",
    "size" : 1025,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -12277,7 +12277,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTI13CapturedStdFd",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -12305,7 +12305,7 @@
    "referenced_type" : "_ZTI13TemporaryFile",
    "self_type" : "_ZTI13TemporaryFile",
    "size" : 1032,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -12321,7 +12321,7 @@
    "referenced_type" : "_ZTI14CapturedStderr",
    "self_type" : "_ZTI14CapturedStderr",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -12337,7 +12337,7 @@
    "referenced_type" : "_ZTI14CapturedStdout",
    "self_type" : "_ZTI14CapturedStdout",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -22031,7 +22031,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -22049,7 +22049,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -22079,7 +22079,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 1,
@@ -22089,7 +22089,7 @@
    "referenced_type" : "_ZTIN7android4base10boot_clockE",
    "self_type" : "_ZTIN7android4base10boot_clockE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -22106,7 +22106,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -22115,7 +22115,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -22133,7 +22133,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -22187,7 +22187,7 @@
    "referenced_type" : "_ZTIN7android4base14CachedPropertyE",
    "self_type" : "_ZTIN7android4base14CachedPropertyE",
    "size" : 152,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -22208,7 +22208,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -22230,7 +22230,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -22252,7 +22252,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -22274,7 +22274,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -22296,7 +22296,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -22318,7 +22318,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -22340,7 +22340,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -22362,7 +22362,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -22384,7 +22384,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -22406,7 +22406,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -22428,7 +22428,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -22450,7 +22450,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -22472,7 +22472,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -22494,7 +22494,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIilEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIilEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIl" ]
   },
   {
@@ -22513,7 +22513,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -22532,7 +22532,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -22550,7 +22550,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -22575,7 +22575,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 1,
@@ -22585,7 +22585,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPidsE",
    "self_type" : "_ZTIN7android4base7AllPidsE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 8,
@@ -23683,7 +23683,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTION7android4base10MappedFileE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -23692,7 +23692,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -23701,7 +23701,7 @@
    "referenced_type" : "_ZTINSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "self_type" : "_ZTIONSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -23710,7 +23710,7 @@
    "referenced_type" : "_ZTINSt3__18functionIFvPKcEEE",
    "self_type" : "_ZTIONSt3__18functionIFvPKcEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
diff --git a/30/64/arm_armv7-a-neon/source-based/libbase.so.lsdump b/30/64/arm_armv7-a-neon/source-based/libbase.so.lsdump
index 3a94f71a..a2765733 100644
--- a/30/64/arm_armv7-a-neon/source-based/libbase.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/libbase.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA1024_c",
    "size" : 1024,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -224,7 +224,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA92_c",
    "size" : 92,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "linker_set_key" : "_ZTIA_c",
@@ -1783,7 +1783,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1808,7 +1808,7 @@
    "referenced_type" : "_ZTIN7android4base15ParseBoolResultE",
    "self_type" : "_ZTIN7android4base15ParseBoolResultE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsebool.h",
+   "source_file" : "/system/libbase/include/android-base/parsebool.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -1841,7 +1841,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -2200,7 +2200,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -2213,7 +2213,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -2226,7 +2226,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -2239,7 +2239,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -2252,7 +2252,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "CapturedStdFd::str",
@@ -2265,7 +2265,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Stop",
@@ -2278,7 +2278,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Reset",
@@ -2291,7 +2291,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Start",
@@ -2304,7 +2304,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -2320,7 +2320,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -2336,7 +2336,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -2349,7 +2349,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -2362,7 +2362,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "access" : "private",
@@ -2379,7 +2379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::release",
@@ -2392,7 +2392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2408,7 +2408,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2421,7 +2421,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2437,7 +2437,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2450,7 +2450,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -2463,7 +2463,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -2476,7 +2476,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "fmt::v6::format_error::~format_error",
@@ -3284,8 +3284,8 @@
      "referenced_type" : "_ZTIPN7android4base10LogMessageE"
     }
    ],
-   "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/logging.sdump",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/logging.sdump",
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogLine",
@@ -3309,7 +3309,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3337,7 +3337,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3368,7 +3368,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3396,7 +3396,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3427,7 +3427,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -3440,7 +3440,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -3453,7 +3453,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -3470,7 +3470,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -3487,7 +3487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::operator()",
@@ -3518,7 +3518,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromOsHandle",
@@ -3539,7 +3539,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__110unique_ptrIN7android4base10MappedFileENS_14default_deleteIS3_EEEE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "access" : "private",
@@ -3553,7 +3553,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromFd",
@@ -3574,7 +3574,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__110unique_ptrIN7android4base10MappedFileENS_14default_deleteIS3_EEEE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::MappedFile",
@@ -3590,7 +3590,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::MappedFile",
@@ -3606,7 +3606,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -3619,7 +3619,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -3632,7 +3632,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::operator=",
@@ -3648,7 +3648,7 @@
     }
    ],
    "return_type" : "_ZTIRN7android4base10MappedFileE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::SetAborter",
@@ -3660,7 +3660,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -3675,7 +3675,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -3690,7 +3690,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::WriteFully",
@@ -3708,13 +3708,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::boot_clock::now",
    "linker_set_key" : "_ZN7android4base10boot_clock3nowEv",
    "return_type" : "_ZTINSt3__16chrono10time_pointIN7android4base10boot_clockENS0_8durationIxNS_5ratioILx1ELx1000000000EEEEEEE",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "function_name" : "android::base::GetProperty",
@@ -3722,20 +3722,20 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::GetThreadId",
    "linker_set_key" : "_ZN7android4base11GetThreadIdEv",
    "return_type" : "_ZTIy",
-   "source_file" : "/system/core/base/include/android-base/threads.h"
+   "source_file" : "/system/libbase/include/android-base/threads.h"
   },
   {
    "function_name" : "android::base::InitLogging",
@@ -3755,7 +3755,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetProperty",
@@ -3763,14 +3763,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::StdioLogger",
@@ -3797,7 +3797,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::KernelLogger",
@@ -3824,7 +3824,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StderrLogger",
@@ -3851,7 +3851,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringPrintf",
@@ -3863,7 +3863,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::SetDefaultTag",
@@ -3871,11 +3871,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/logging.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/logging.sdump"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringAppendF",
@@ -3883,14 +3883,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/stringprintf.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/stringprintf.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringAppendV",
@@ -3898,7 +3898,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/stringprintf.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/stringprintf.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -3908,7 +3908,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringReplace",
@@ -3929,7 +3929,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::CachedProperty::Get",
@@ -3946,7 +3946,7 @@
     }
    ],
    "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
@@ -3962,7 +3962,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
@@ -3978,7 +3978,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::DefaultAborter",
@@ -3990,7 +3990,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ReadFdToString",
@@ -4005,7 +4005,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetBoolProperty",
@@ -4013,14 +4013,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump"
     },
     {
      "referenced_type" : "_ZTIb"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::ParseNetAddress",
@@ -4028,23 +4028,23 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
      "referenced_type" : "_ZTIPi"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/parsenetaddress.sdump"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "function_name" : "android::base::WaitForProperty",
@@ -4052,10 +4052,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump"
     },
     {
      "default_arg" : true,
@@ -4063,7 +4063,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::WriteStringToFd",
@@ -4078,7 +4078,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EqualsIgnoreCase",
@@ -4093,7 +4093,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::ReadFileToString",
@@ -4112,13 +4112,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetExecutablePath",
    "linker_set_key" : "_ZN7android4base17GetExecutablePathEv",
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ReadFullyAtOffset",
@@ -4139,7 +4139,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -4155,7 +4155,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -4171,7 +4171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -4184,7 +4184,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -4197,7 +4197,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -4216,7 +4216,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -4244,7 +4244,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWithIgnoreCase",
@@ -4259,7 +4259,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::RemoveFileIfExists",
@@ -4275,7 +4275,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::StartsWithIgnoreCase",
@@ -4290,13 +4290,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::GetMinimumLogSeverity",
    "linker_set_key" : "_ZN7android4base21GetMinimumLogSeverityEv",
    "return_type" : "_ZTIN7android4base11LogSeverityE",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetMinimumLogSeverity",
@@ -4308,13 +4308,13 @@
     }
    ],
    "return_type" : "_ZTIN7android4base11LogSeverityE",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::GetExecutableDirectory",
    "linker_set_key" : "_ZN7android4base22GetExecutableDirectoryEv",
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SystemErrorCodeToString",
@@ -4326,7 +4326,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/errors.h"
+   "source_file" : "/system/libbase/include/android-base/errors.h"
   },
   {
    "function_name" : "android::base::WaitForPropertyCreation",
@@ -4334,7 +4334,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump"
     },
     {
      "default_arg" : true,
@@ -4342,7 +4342,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::SendFileDescriptorVector",
@@ -4363,7 +4363,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::ReceiveFileDescriptorVector",
@@ -4387,7 +4387,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::Join",
@@ -4398,15 +4398,15 @@
      "referenced_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
-    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump"
+    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump"
    ]
   },
   {
@@ -4422,7 +4422,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
@@ -4438,15 +4438,15 @@
      "referenced_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
-    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump"
+    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump"
    ]
   },
   {
@@ -4462,7 +4462,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE", "_ZTIc" ]
   },
   {
@@ -4471,11 +4471,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Split",
@@ -4483,14 +4483,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "access" : "private",
@@ -4504,7 +4504,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "function_name" : "android::base::Dirname",
@@ -4516,7 +4516,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Basename",
@@ -4528,7 +4528,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -4543,7 +4543,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -4558,7 +4558,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Readlink",
@@ -4573,7 +4573,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Realpath",
@@ -4588,7 +4588,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ParseBool",
@@ -4600,7 +4600,7 @@
     }
    ],
    "return_type" : "_ZTIN7android4base15ParseBoolResultE",
-   "source_file" : "/system/core/base/include/android-base/parsebool.h"
+   "source_file" : "/system/libbase/include/android-base/parsebool.h"
   },
   {
    "function_name" : "android::base::ParseUint",
@@ -4623,7 +4623,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIh" ]
   },
   {
@@ -4647,7 +4647,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIj" ]
   },
   {
@@ -4671,7 +4671,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIt" ]
   },
   {
@@ -4690,7 +4690,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SetLogger",
@@ -4702,7 +4702,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ShouldLog",
@@ -4717,7 +4717,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::operator<<",
@@ -4732,7 +4732,7 @@
     }
    ],
    "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -4746,7 +4746,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "fmt::v6::internal::locale_ref::get",
@@ -5063,7 +5063,7 @@
    "referenced_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIRKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5072,7 +5072,7 @@
    "referenced_type" : "_ZTIKN7android4base5TimerE",
    "self_type" : "_ZTIRKN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -5081,7 +5081,7 @@
    "referenced_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIRKN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -5096,46 +5096,46 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/file.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/file.sdump",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/logging.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/logging.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/logging.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/logging.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/parsenetaddress.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/parsenetaddress.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/parsenetaddress.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/parsenetaddress.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/properties.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/properties.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/strings.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/strings.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5162,7 +5162,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5171,7 +5171,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5180,7 +5180,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5189,7 +5189,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5198,7 +5198,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -5207,16 +5207,16 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/cmsg.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/cmsg.sdump",
+   "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/cmsg.sdump",
+   "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/cmsg.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -5774,7 +5774,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIRN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -5783,7 +5783,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIRN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -5792,7 +5792,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -5903,7 +5903,7 @@
    "referenced_type" : "_ZTI12TemporaryDir",
    "self_type" : "_ZTIP12TemporaryDir",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -5912,7 +5912,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTIP13CapturedStdFd",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5921,7 +5921,7 @@
    "referenced_type" : "_ZTI13TemporaryFile",
    "self_type" : "_ZTIP13TemporaryFile",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -5930,7 +5930,7 @@
    "referenced_type" : "_ZTI14CapturedStderr",
    "self_type" : "_ZTIP14CapturedStderr",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5939,7 +5939,7 @@
    "referenced_type" : "_ZTI14CapturedStdout",
    "self_type" : "_ZTIP14CapturedStdout",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5948,7 +5948,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5957,7 +5957,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5993,7 +5993,7 @@
    "referenced_type" : "_ZTIK13CapturedStdFd",
    "self_type" : "_ZTIPK13CapturedStdFd",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -6002,7 +6002,7 @@
    "referenced_type" : "_ZTIK9prop_info",
    "self_type" : "_ZTIPK9prop_info",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -6011,7 +6011,7 @@
    "referenced_type" : "_ZTIK9prop_info#ODR:",
    "self_type" : "_ZTIPK9prop_info#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -7532,7 +7532,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -7541,7 +7541,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7550,7 +7550,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -7559,7 +7559,7 @@
    "referenced_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7568,7 +7568,7 @@
    "referenced_type" : "_ZTIKN7android4base5TimerE",
    "self_type" : "_ZTIPKN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -7577,7 +7577,7 @@
    "referenced_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIPKN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -7586,7 +7586,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7595,43 +7595,43 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/cmsg.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/cmsg.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/cmsg.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/cmsg.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/file.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/file.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/file.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/file.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/logging.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/logging.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/logging.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/logging.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/test_utils.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/core/base/test_utils.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/test_utils.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv7-a-neon_static/obj/system/libbase/test_utils.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7640,7 +7640,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7649,7 +7649,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7658,7 +7658,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7676,7 +7676,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -8621,7 +8621,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIPN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8630,7 +8630,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIPN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8639,7 +8639,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -8648,7 +8648,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8657,7 +8657,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -8666,7 +8666,7 @@
    "referenced_type" : "_ZTIN7android4base14CachedPropertyE",
    "self_type" : "_ZTIPN7android4base14CachedPropertyE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -8675,7 +8675,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8684,7 +8684,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8693,7 +8693,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8702,7 +8702,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8711,7 +8711,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8720,7 +8720,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8729,7 +8729,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8738,7 +8738,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8747,7 +8747,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8756,7 +8756,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8765,7 +8765,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8774,7 +8774,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8783,7 +8783,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8792,7 +8792,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIixEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8801,7 +8801,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8810,7 +8810,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIPN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8819,7 +8819,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIPN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -8828,7 +8828,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIPN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -8837,7 +8837,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPidsE",
    "self_type" : "_ZTIPN7android4base7AllPidsE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -8846,7 +8846,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -8855,7 +8855,7 @@
    "referenced_type" : "_ZTINSt3__117basic_string_viewIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIPNSt3__117basic_string_viewIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -8864,7 +8864,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEEE",
    "self_type" : "_ZTIPNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -8873,7 +8873,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8882,7 +8882,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8891,7 +8891,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIPb",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -8900,7 +8900,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -8909,7 +8909,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8918,7 +8918,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8927,7 +8927,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8936,7 +8936,7 @@
    "referenced_type" : "_ZTIs",
    "self_type" : "_ZTIPs",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8945,7 +8945,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8954,7 +8954,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8972,7 +8972,7 @@
    "referenced_type" : "_ZTIx",
    "self_type" : "_ZTIPx",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8981,7 +8981,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIPy",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   }
  ],
  "qualified_types" :
@@ -9156,7 +9156,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTIK13CapturedStdFd",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "is_const" : true,
@@ -9164,7 +9164,7 @@
    "name" : "const prop_info",
    "referenced_type" : "_ZTI9prop_info",
    "self_type" : "_ZTIK9prop_info",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -10916,7 +10916,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -10926,7 +10926,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -10936,7 +10936,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -10946,7 +10946,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -10956,7 +10956,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIKN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -10966,7 +10966,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -10976,7 +10976,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -10986,7 +10986,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -11006,7 +11006,7 @@
    "referenced_type" : "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "self_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -11016,7 +11016,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "self_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -11026,7 +11026,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIiNS_9allocatorIiEEEE",
    "self_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 1,
@@ -11086,7 +11086,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -11096,7 +11096,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -11106,7 +11106,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -11136,7 +11136,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -11146,7 +11146,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -11164,7 +11164,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -11210,7 +11210,7 @@
    "referenced_type" : "_ZTI12TemporaryDir",
    "self_type" : "_ZTI12TemporaryDir",
    "size" : 1025,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -11240,7 +11240,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTI13CapturedStdFd",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -11268,7 +11268,7 @@
    "referenced_type" : "_ZTI13TemporaryFile",
    "self_type" : "_ZTI13TemporaryFile",
    "size" : 1032,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -11284,7 +11284,7 @@
    "referenced_type" : "_ZTI14CapturedStderr",
    "self_type" : "_ZTI14CapturedStderr",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -11300,7 +11300,7 @@
    "referenced_type" : "_ZTI14CapturedStdout",
    "self_type" : "_ZTI14CapturedStdout",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -19614,7 +19614,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -19632,7 +19632,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -19662,7 +19662,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 1,
@@ -19672,7 +19672,7 @@
    "referenced_type" : "_ZTIN7android4base10boot_clockE",
    "self_type" : "_ZTIN7android4base10boot_clockE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -19689,7 +19689,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -19698,7 +19698,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -19716,7 +19716,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -19770,7 +19770,7 @@
    "referenced_type" : "_ZTIN7android4base14CachedPropertyE",
    "self_type" : "_ZTIN7android4base14CachedPropertyE",
    "size" : 132,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -19791,7 +19791,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -19813,7 +19813,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -19835,7 +19835,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -19857,7 +19857,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -19879,7 +19879,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -19901,7 +19901,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -19923,7 +19923,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -19945,7 +19945,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -19967,7 +19967,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -19989,7 +19989,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -20011,7 +20011,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -20033,7 +20033,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -20055,7 +20055,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -20077,7 +20077,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIx" ]
   },
   {
@@ -20096,7 +20096,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -20115,7 +20115,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -20133,7 +20133,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -20158,7 +20158,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 1,
@@ -20168,7 +20168,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPidsE",
    "self_type" : "_ZTIN7android4base7AllPidsE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -21050,7 +21050,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTION7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -21059,7 +21059,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -21068,7 +21068,7 @@
    "referenced_type" : "_ZTINSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "self_type" : "_ZTIONSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -21077,7 +21077,7 @@
    "referenced_type" : "_ZTINSt3__18functionIFvPKcEEE",
    "self_type" : "_ZTIONSt3__18functionIFvPKcEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
diff --git a/30/64/arm_armv8-a/source-based/libbase.so.lsdump b/30/64/arm_armv8-a/source-based/libbase.so.lsdump
index fb762976..ba74d2bd 100644
--- a/30/64/arm_armv8-a/source-based/libbase.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/libbase.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA1024_c",
    "size" : 1024,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -224,7 +224,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA92_c",
    "size" : 92,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "linker_set_key" : "_ZTIA_c",
@@ -1783,7 +1783,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1808,7 +1808,7 @@
    "referenced_type" : "_ZTIN7android4base15ParseBoolResultE",
    "self_type" : "_ZTIN7android4base15ParseBoolResultE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsebool.h",
+   "source_file" : "/system/libbase/include/android-base/parsebool.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -1841,7 +1841,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -2200,7 +2200,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -2213,7 +2213,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -2226,7 +2226,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -2239,7 +2239,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -2252,7 +2252,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "CapturedStdFd::str",
@@ -2265,7 +2265,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Stop",
@@ -2278,7 +2278,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Reset",
@@ -2291,7 +2291,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Start",
@@ -2304,7 +2304,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -2320,7 +2320,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -2336,7 +2336,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -2349,7 +2349,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -2362,7 +2362,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "access" : "private",
@@ -2379,7 +2379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::release",
@@ -2392,7 +2392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2408,7 +2408,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2421,7 +2421,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2437,7 +2437,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2450,7 +2450,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -2463,7 +2463,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -2476,7 +2476,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "fmt::v6::format_error::~format_error",
@@ -3284,8 +3284,8 @@
      "referenced_type" : "_ZTIPN7android4base10LogMessageE"
     }
    ],
-   "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/logging.sdump",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/logging.sdump",
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogLine",
@@ -3309,7 +3309,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3337,7 +3337,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3368,7 +3368,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3396,7 +3396,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3427,7 +3427,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -3440,7 +3440,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -3453,7 +3453,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -3470,7 +3470,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -3487,7 +3487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::operator()",
@@ -3518,7 +3518,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromOsHandle",
@@ -3539,7 +3539,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__110unique_ptrIN7android4base10MappedFileENS_14default_deleteIS3_EEEE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "access" : "private",
@@ -3553,7 +3553,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromFd",
@@ -3574,7 +3574,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__110unique_ptrIN7android4base10MappedFileENS_14default_deleteIS3_EEEE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::MappedFile",
@@ -3590,7 +3590,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::MappedFile",
@@ -3606,7 +3606,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -3619,7 +3619,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -3632,7 +3632,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::operator=",
@@ -3648,7 +3648,7 @@
     }
    ],
    "return_type" : "_ZTIRN7android4base10MappedFileE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::SetAborter",
@@ -3660,7 +3660,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -3675,7 +3675,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -3690,7 +3690,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::WriteFully",
@@ -3708,13 +3708,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::boot_clock::now",
    "linker_set_key" : "_ZN7android4base10boot_clock3nowEv",
    "return_type" : "_ZTINSt3__16chrono10time_pointIN7android4base10boot_clockENS0_8durationIxNS_5ratioILx1ELx1000000000EEEEEEE",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "function_name" : "android::base::GetProperty",
@@ -3722,20 +3722,20 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/properties.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::GetThreadId",
    "linker_set_key" : "_ZN7android4base11GetThreadIdEv",
    "return_type" : "_ZTIy",
-   "source_file" : "/system/core/base/include/android-base/threads.h"
+   "source_file" : "/system/libbase/include/android-base/threads.h"
   },
   {
    "function_name" : "android::base::InitLogging",
@@ -3755,7 +3755,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetProperty",
@@ -3763,14 +3763,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/properties.sdump"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::StdioLogger",
@@ -3797,7 +3797,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::KernelLogger",
@@ -3824,7 +3824,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StderrLogger",
@@ -3851,7 +3851,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringPrintf",
@@ -3863,7 +3863,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::SetDefaultTag",
@@ -3871,11 +3871,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/logging.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/logging.sdump"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringAppendF",
@@ -3883,14 +3883,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/stringprintf.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/stringprintf.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringAppendV",
@@ -3898,7 +3898,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/stringprintf.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/stringprintf.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -3908,7 +3908,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringReplace",
@@ -3929,7 +3929,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::CachedProperty::Get",
@@ -3946,7 +3946,7 @@
     }
    ],
    "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
@@ -3962,7 +3962,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
@@ -3978,7 +3978,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::DefaultAborter",
@@ -3990,7 +3990,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ReadFdToString",
@@ -4005,7 +4005,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetBoolProperty",
@@ -4013,14 +4013,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/properties.sdump"
     },
     {
      "referenced_type" : "_ZTIb"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::ParseNetAddress",
@@ -4028,23 +4028,23 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
      "referenced_type" : "_ZTIPi"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/parsenetaddress.sdump"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "function_name" : "android::base::WaitForProperty",
@@ -4052,10 +4052,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/properties.sdump"
     },
     {
      "default_arg" : true,
@@ -4063,7 +4063,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::WriteStringToFd",
@@ -4078,7 +4078,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EqualsIgnoreCase",
@@ -4093,7 +4093,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::ReadFileToString",
@@ -4112,13 +4112,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetExecutablePath",
    "linker_set_key" : "_ZN7android4base17GetExecutablePathEv",
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ReadFullyAtOffset",
@@ -4139,7 +4139,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -4155,7 +4155,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -4171,7 +4171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -4184,7 +4184,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -4197,7 +4197,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -4216,7 +4216,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -4244,7 +4244,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWithIgnoreCase",
@@ -4259,7 +4259,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::RemoveFileIfExists",
@@ -4275,7 +4275,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::StartsWithIgnoreCase",
@@ -4290,13 +4290,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::GetMinimumLogSeverity",
    "linker_set_key" : "_ZN7android4base21GetMinimumLogSeverityEv",
    "return_type" : "_ZTIN7android4base11LogSeverityE",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetMinimumLogSeverity",
@@ -4308,13 +4308,13 @@
     }
    ],
    "return_type" : "_ZTIN7android4base11LogSeverityE",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::GetExecutableDirectory",
    "linker_set_key" : "_ZN7android4base22GetExecutableDirectoryEv",
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SystemErrorCodeToString",
@@ -4326,7 +4326,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/errors.h"
+   "source_file" : "/system/libbase/include/android-base/errors.h"
   },
   {
    "function_name" : "android::base::WaitForPropertyCreation",
@@ -4334,7 +4334,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/properties.sdump"
     },
     {
      "default_arg" : true,
@@ -4342,7 +4342,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::SendFileDescriptorVector",
@@ -4363,7 +4363,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::ReceiveFileDescriptorVector",
@@ -4387,7 +4387,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::Join",
@@ -4398,15 +4398,15 @@
      "referenced_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
-    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/strings.sdump"
+    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/strings.sdump"
    ]
   },
   {
@@ -4422,7 +4422,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
@@ -4438,15 +4438,15 @@
      "referenced_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
-    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/strings.sdump"
+    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/strings.sdump"
    ]
   },
   {
@@ -4462,7 +4462,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE", "_ZTIc" ]
   },
   {
@@ -4471,11 +4471,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Split",
@@ -4483,14 +4483,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/strings.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "access" : "private",
@@ -4504,7 +4504,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "function_name" : "android::base::Dirname",
@@ -4516,7 +4516,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Basename",
@@ -4528,7 +4528,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -4543,7 +4543,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -4558,7 +4558,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Readlink",
@@ -4573,7 +4573,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Realpath",
@@ -4588,7 +4588,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ParseBool",
@@ -4600,7 +4600,7 @@
     }
    ],
    "return_type" : "_ZTIN7android4base15ParseBoolResultE",
-   "source_file" : "/system/core/base/include/android-base/parsebool.h"
+   "source_file" : "/system/libbase/include/android-base/parsebool.h"
   },
   {
    "function_name" : "android::base::ParseUint",
@@ -4623,7 +4623,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIh" ]
   },
   {
@@ -4647,7 +4647,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIj" ]
   },
   {
@@ -4671,7 +4671,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIt" ]
   },
   {
@@ -4690,7 +4690,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SetLogger",
@@ -4702,7 +4702,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ShouldLog",
@@ -4717,7 +4717,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::operator<<",
@@ -4732,7 +4732,7 @@
     }
    ],
    "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -4746,7 +4746,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "fmt::v6::internal::locale_ref::get",
@@ -5063,7 +5063,7 @@
    "referenced_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIRKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5072,7 +5072,7 @@
    "referenced_type" : "_ZTIKN7android4base5TimerE",
    "self_type" : "_ZTIRKN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -5081,7 +5081,7 @@
    "referenced_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIRKN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -5096,46 +5096,46 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/file.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/file.sdump",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/logging.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/logging.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/logging.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/logging.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/parsenetaddress.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/parsenetaddress.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/parsenetaddress.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/parsenetaddress.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/properties.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/properties.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/properties.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/properties.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/strings.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/strings.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/strings.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/strings.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5162,7 +5162,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5171,7 +5171,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5180,7 +5180,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5189,7 +5189,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5198,7 +5198,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -5207,16 +5207,16 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/cmsg.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/cmsg.sdump",
+   "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/cmsg.sdump",
+   "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/cmsg.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -5774,7 +5774,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIRN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -5783,7 +5783,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIRN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -5792,7 +5792,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -5903,7 +5903,7 @@
    "referenced_type" : "_ZTI12TemporaryDir",
    "self_type" : "_ZTIP12TemporaryDir",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -5912,7 +5912,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTIP13CapturedStdFd",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5921,7 +5921,7 @@
    "referenced_type" : "_ZTI13TemporaryFile",
    "self_type" : "_ZTIP13TemporaryFile",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -5930,7 +5930,7 @@
    "referenced_type" : "_ZTI14CapturedStderr",
    "self_type" : "_ZTIP14CapturedStderr",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5939,7 +5939,7 @@
    "referenced_type" : "_ZTI14CapturedStdout",
    "self_type" : "_ZTIP14CapturedStdout",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5948,7 +5948,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5957,7 +5957,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5993,7 +5993,7 @@
    "referenced_type" : "_ZTIK13CapturedStdFd",
    "self_type" : "_ZTIPK13CapturedStdFd",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -6002,7 +6002,7 @@
    "referenced_type" : "_ZTIK9prop_info",
    "self_type" : "_ZTIPK9prop_info",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -6011,7 +6011,7 @@
    "referenced_type" : "_ZTIK9prop_info#ODR:",
    "self_type" : "_ZTIPK9prop_info#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -7532,7 +7532,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -7541,7 +7541,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7550,7 +7550,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -7559,7 +7559,7 @@
    "referenced_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7568,7 +7568,7 @@
    "referenced_type" : "_ZTIKN7android4base5TimerE",
    "self_type" : "_ZTIPKN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -7577,7 +7577,7 @@
    "referenced_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIPKN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -7586,7 +7586,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7595,43 +7595,43 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/cmsg.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/cmsg.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/cmsg.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/cmsg.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/file.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/file.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/file.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/file.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/logging.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/logging.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/logging.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/logging.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/test_utils.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_arm_armv8-a_static/obj/system/core/base/test_utils.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/test_utils.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_arm_armv8-a_static/obj/system/libbase/test_utils.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7640,7 +7640,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7649,7 +7649,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7658,7 +7658,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7676,7 +7676,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -8621,7 +8621,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIPN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8630,7 +8630,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIPN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8639,7 +8639,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -8648,7 +8648,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8657,7 +8657,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -8666,7 +8666,7 @@
    "referenced_type" : "_ZTIN7android4base14CachedPropertyE",
    "self_type" : "_ZTIPN7android4base14CachedPropertyE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -8675,7 +8675,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8684,7 +8684,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8693,7 +8693,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8702,7 +8702,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8711,7 +8711,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8720,7 +8720,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8729,7 +8729,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8738,7 +8738,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8747,7 +8747,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8756,7 +8756,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8765,7 +8765,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8774,7 +8774,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8783,7 +8783,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8792,7 +8792,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIixEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8801,7 +8801,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8810,7 +8810,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIPN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8819,7 +8819,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIPN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -8828,7 +8828,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIPN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -8837,7 +8837,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPidsE",
    "self_type" : "_ZTIPN7android4base7AllPidsE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -8846,7 +8846,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -8855,7 +8855,7 @@
    "referenced_type" : "_ZTINSt3__117basic_string_viewIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIPNSt3__117basic_string_viewIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -8864,7 +8864,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEEE",
    "self_type" : "_ZTIPNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -8873,7 +8873,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8882,7 +8882,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8891,7 +8891,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIPb",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -8900,7 +8900,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -8909,7 +8909,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8918,7 +8918,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8927,7 +8927,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8936,7 +8936,7 @@
    "referenced_type" : "_ZTIs",
    "self_type" : "_ZTIPs",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8945,7 +8945,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8954,7 +8954,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8972,7 +8972,7 @@
    "referenced_type" : "_ZTIx",
    "self_type" : "_ZTIPx",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8981,7 +8981,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIPy",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   }
  ],
  "qualified_types" :
@@ -9156,7 +9156,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTIK13CapturedStdFd",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "is_const" : true,
@@ -9164,7 +9164,7 @@
    "name" : "const prop_info",
    "referenced_type" : "_ZTI9prop_info",
    "self_type" : "_ZTIK9prop_info",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -10916,7 +10916,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -10926,7 +10926,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -10936,7 +10936,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -10946,7 +10946,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -10956,7 +10956,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIKN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -10966,7 +10966,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -10976,7 +10976,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -10986,7 +10986,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -11006,7 +11006,7 @@
    "referenced_type" : "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "self_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -11016,7 +11016,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "self_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -11026,7 +11026,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIiNS_9allocatorIiEEEE",
    "self_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 1,
@@ -11086,7 +11086,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -11096,7 +11096,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -11106,7 +11106,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -11136,7 +11136,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -11146,7 +11146,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -11164,7 +11164,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -11210,7 +11210,7 @@
    "referenced_type" : "_ZTI12TemporaryDir",
    "self_type" : "_ZTI12TemporaryDir",
    "size" : 1025,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -11240,7 +11240,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTI13CapturedStdFd",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -11268,7 +11268,7 @@
    "referenced_type" : "_ZTI13TemporaryFile",
    "self_type" : "_ZTI13TemporaryFile",
    "size" : 1032,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -11284,7 +11284,7 @@
    "referenced_type" : "_ZTI14CapturedStderr",
    "self_type" : "_ZTI14CapturedStderr",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -11300,7 +11300,7 @@
    "referenced_type" : "_ZTI14CapturedStdout",
    "self_type" : "_ZTI14CapturedStdout",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -19614,7 +19614,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -19632,7 +19632,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -19662,7 +19662,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 1,
@@ -19672,7 +19672,7 @@
    "referenced_type" : "_ZTIN7android4base10boot_clockE",
    "self_type" : "_ZTIN7android4base10boot_clockE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -19689,7 +19689,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -19698,7 +19698,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -19716,7 +19716,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -19770,7 +19770,7 @@
    "referenced_type" : "_ZTIN7android4base14CachedPropertyE",
    "self_type" : "_ZTIN7android4base14CachedPropertyE",
    "size" : 132,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -19791,7 +19791,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -19813,7 +19813,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -19835,7 +19835,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -19857,7 +19857,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -19879,7 +19879,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -19901,7 +19901,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -19923,7 +19923,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -19945,7 +19945,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -19967,7 +19967,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -19989,7 +19989,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -20011,7 +20011,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -20033,7 +20033,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -20055,7 +20055,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -20077,7 +20077,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIx" ]
   },
   {
@@ -20096,7 +20096,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -20115,7 +20115,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -20133,7 +20133,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -20158,7 +20158,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 1,
@@ -20168,7 +20168,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPidsE",
    "self_type" : "_ZTIN7android4base7AllPidsE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -21050,7 +21050,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTION7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -21059,7 +21059,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -21068,7 +21068,7 @@
    "referenced_type" : "_ZTINSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "self_type" : "_ZTIONSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -21077,7 +21077,7 @@
    "referenced_type" : "_ZTINSt3__18functionIFvPKcEEE",
    "self_type" : "_ZTIONSt3__18functionIFvPKcEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
diff --git a/30/64/x86/source-based/libbase.so.lsdump b/30/64/x86/source-based/libbase.so.lsdump
index 99d3688a..40b31fa4 100644
--- a/30/64/x86/source-based/libbase.so.lsdump
+++ b/30/64/x86/source-based/libbase.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA1024_c",
    "size" : 1024,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -224,7 +224,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA92_c",
    "size" : 92,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "linker_set_key" : "_ZTIA_c",
@@ -1777,7 +1777,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1802,7 +1802,7 @@
    "referenced_type" : "_ZTIN7android4base15ParseBoolResultE",
    "self_type" : "_ZTIN7android4base15ParseBoolResultE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsebool.h",
+   "source_file" : "/system/libbase/include/android-base/parsebool.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -1835,7 +1835,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -2194,7 +2194,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -2207,7 +2207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -2220,7 +2220,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -2233,7 +2233,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -2246,7 +2246,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "CapturedStdFd::str",
@@ -2259,7 +2259,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Stop",
@@ -2272,7 +2272,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Reset",
@@ -2285,7 +2285,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Start",
@@ -2298,7 +2298,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -2314,7 +2314,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -2330,7 +2330,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -2343,7 +2343,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -2356,7 +2356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "access" : "private",
@@ -2373,7 +2373,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::release",
@@ -2386,7 +2386,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2402,7 +2402,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2415,7 +2415,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2431,7 +2431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2444,7 +2444,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -2457,7 +2457,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -2470,7 +2470,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "fmt::v6::format_error::~format_error",
@@ -3262,8 +3262,8 @@
      "referenced_type" : "_ZTIPN7android4base10LogMessageE"
     }
    ],
-   "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/logging.sdump",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/logging.sdump",
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogLine",
@@ -3287,7 +3287,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3315,7 +3315,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3346,7 +3346,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3374,7 +3374,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3405,7 +3405,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -3418,7 +3418,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -3431,7 +3431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -3448,7 +3448,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -3465,7 +3465,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::operator()",
@@ -3496,7 +3496,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromOsHandle",
@@ -3517,7 +3517,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__110unique_ptrIN7android4base10MappedFileENS_14default_deleteIS3_EEEE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "access" : "private",
@@ -3531,7 +3531,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromFd",
@@ -3552,7 +3552,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__110unique_ptrIN7android4base10MappedFileENS_14default_deleteIS3_EEEE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::MappedFile",
@@ -3568,7 +3568,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::MappedFile",
@@ -3584,7 +3584,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -3597,7 +3597,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -3610,7 +3610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::operator=",
@@ -3626,7 +3626,7 @@
     }
    ],
    "return_type" : "_ZTIRN7android4base10MappedFileE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::SetAborter",
@@ -3638,7 +3638,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -3653,7 +3653,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -3668,7 +3668,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::WriteFully",
@@ -3686,13 +3686,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::boot_clock::now",
    "linker_set_key" : "_ZN7android4base10boot_clock3nowEv",
    "return_type" : "_ZTINSt3__16chrono10time_pointIN7android4base10boot_clockENS0_8durationIxNS_5ratioILx1ELx1000000000EEEEEEE",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "function_name" : "android::base::GetProperty",
@@ -3700,20 +3700,20 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::GetThreadId",
    "linker_set_key" : "_ZN7android4base11GetThreadIdEv",
    "return_type" : "_ZTIy",
-   "source_file" : "/system/core/base/include/android-base/threads.h"
+   "source_file" : "/system/libbase/include/android-base/threads.h"
   },
   {
    "function_name" : "android::base::InitLogging",
@@ -3733,7 +3733,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetProperty",
@@ -3741,14 +3741,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::StdioLogger",
@@ -3775,7 +3775,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::KernelLogger",
@@ -3802,7 +3802,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StderrLogger",
@@ -3829,7 +3829,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringPrintf",
@@ -3841,7 +3841,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::SetDefaultTag",
@@ -3849,11 +3849,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/logging.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/logging.sdump"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringAppendF",
@@ -3861,14 +3861,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/stringprintf.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/stringprintf.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringAppendV",
@@ -3876,7 +3876,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/stringprintf.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/stringprintf.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -3886,7 +3886,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringReplace",
@@ -3907,7 +3907,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::CachedProperty::Get",
@@ -3924,7 +3924,7 @@
     }
    ],
    "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
@@ -3940,7 +3940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
@@ -3956,7 +3956,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::DefaultAborter",
@@ -3968,7 +3968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ReadFdToString",
@@ -3983,7 +3983,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetBoolProperty",
@@ -3991,14 +3991,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump"
     },
     {
      "referenced_type" : "_ZTIb"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::ParseNetAddress",
@@ -4006,23 +4006,23 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
      "referenced_type" : "_ZTIPi"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/parsenetaddress.sdump"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "function_name" : "android::base::WaitForProperty",
@@ -4030,10 +4030,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump"
     },
     {
      "default_arg" : true,
@@ -4041,7 +4041,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::WriteStringToFd",
@@ -4056,7 +4056,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EqualsIgnoreCase",
@@ -4071,7 +4071,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::ReadFileToString",
@@ -4090,13 +4090,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetExecutablePath",
    "linker_set_key" : "_ZN7android4base17GetExecutablePathEv",
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ReadFullyAtOffset",
@@ -4117,7 +4117,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -4133,7 +4133,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -4149,7 +4149,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -4162,7 +4162,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -4175,7 +4175,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -4194,7 +4194,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -4222,7 +4222,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWithIgnoreCase",
@@ -4237,7 +4237,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::RemoveFileIfExists",
@@ -4253,7 +4253,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::StartsWithIgnoreCase",
@@ -4268,13 +4268,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::GetMinimumLogSeverity",
    "linker_set_key" : "_ZN7android4base21GetMinimumLogSeverityEv",
    "return_type" : "_ZTIN7android4base11LogSeverityE",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetMinimumLogSeverity",
@@ -4286,13 +4286,13 @@
     }
    ],
    "return_type" : "_ZTIN7android4base11LogSeverityE",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::GetExecutableDirectory",
    "linker_set_key" : "_ZN7android4base22GetExecutableDirectoryEv",
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SystemErrorCodeToString",
@@ -4304,7 +4304,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/errors.h"
+   "source_file" : "/system/libbase/include/android-base/errors.h"
   },
   {
    "function_name" : "android::base::WaitForPropertyCreation",
@@ -4312,7 +4312,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump"
     },
     {
      "default_arg" : true,
@@ -4320,7 +4320,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::SendFileDescriptorVector",
@@ -4341,7 +4341,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::ReceiveFileDescriptorVector",
@@ -4365,7 +4365,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::Join",
@@ -4376,15 +4376,15 @@
      "referenced_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
-    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump"
+    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump"
    ]
   },
   {
@@ -4400,7 +4400,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
@@ -4416,15 +4416,15 @@
      "referenced_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
-    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump"
+    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump"
    ]
   },
   {
@@ -4440,7 +4440,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE", "_ZTIc" ]
   },
   {
@@ -4449,11 +4449,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Split",
@@ -4461,14 +4461,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "access" : "private",
@@ -4482,7 +4482,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "function_name" : "android::base::Dirname",
@@ -4494,7 +4494,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Basename",
@@ -4506,7 +4506,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -4521,7 +4521,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -4536,7 +4536,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Readlink",
@@ -4551,7 +4551,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Realpath",
@@ -4566,7 +4566,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ParseBool",
@@ -4578,7 +4578,7 @@
     }
    ],
    "return_type" : "_ZTIN7android4base15ParseBoolResultE",
-   "source_file" : "/system/core/base/include/android-base/parsebool.h"
+   "source_file" : "/system/libbase/include/android-base/parsebool.h"
   },
   {
    "function_name" : "android::base::ParseUint",
@@ -4601,7 +4601,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIh" ]
   },
   {
@@ -4625,7 +4625,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIj" ]
   },
   {
@@ -4649,7 +4649,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIt" ]
   },
   {
@@ -4668,7 +4668,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SetLogger",
@@ -4680,7 +4680,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ShouldLog",
@@ -4695,7 +4695,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::operator<<",
@@ -4710,7 +4710,7 @@
     }
    ],
    "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -4724,7 +4724,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "fmt::v6::internal::locale_ref::get",
@@ -5041,7 +5041,7 @@
    "referenced_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIRKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5050,7 +5050,7 @@
    "referenced_type" : "_ZTIKN7android4base5TimerE",
    "self_type" : "_ZTIRKN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -5059,7 +5059,7 @@
    "referenced_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIRKN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -5074,46 +5074,46 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/file.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/file.sdump",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/logging.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/logging.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/logging.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/logging.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/parsenetaddress.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/parsenetaddress.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/parsenetaddress.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/parsenetaddress.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/properties.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/properties.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/strings.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/strings.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5140,7 +5140,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5149,7 +5149,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5158,7 +5158,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5167,7 +5167,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5176,7 +5176,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -5185,16 +5185,16 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/cmsg.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/cmsg.sdump",
+   "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/cmsg.sdump",
+   "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/cmsg.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -5752,7 +5752,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIRN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -5761,7 +5761,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIRN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -5770,7 +5770,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -5881,7 +5881,7 @@
    "referenced_type" : "_ZTI12TemporaryDir",
    "self_type" : "_ZTIP12TemporaryDir",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -5890,7 +5890,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTIP13CapturedStdFd",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5899,7 +5899,7 @@
    "referenced_type" : "_ZTI13TemporaryFile",
    "self_type" : "_ZTIP13TemporaryFile",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -5908,7 +5908,7 @@
    "referenced_type" : "_ZTI14CapturedStderr",
    "self_type" : "_ZTIP14CapturedStderr",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5917,7 +5917,7 @@
    "referenced_type" : "_ZTI14CapturedStdout",
    "self_type" : "_ZTIP14CapturedStdout",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5926,7 +5926,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5935,7 +5935,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5971,7 +5971,7 @@
    "referenced_type" : "_ZTIK13CapturedStdFd",
    "self_type" : "_ZTIPK13CapturedStdFd",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5980,7 +5980,7 @@
    "referenced_type" : "_ZTIK9prop_info",
    "self_type" : "_ZTIPK9prop_info",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -5989,7 +5989,7 @@
    "referenced_type" : "_ZTIK9prop_info#ODR:",
    "self_type" : "_ZTIPK9prop_info#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -7510,7 +7510,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -7519,7 +7519,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7528,7 +7528,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -7537,7 +7537,7 @@
    "referenced_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7546,7 +7546,7 @@
    "referenced_type" : "_ZTIKN7android4base5TimerE",
    "self_type" : "_ZTIPKN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -7555,7 +7555,7 @@
    "referenced_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIPKN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -7564,7 +7564,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7573,43 +7573,43 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/cmsg.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/cmsg.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/cmsg.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/cmsg.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/file.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/file.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/file.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/file.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/logging.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/logging.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/logging.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/logging.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/test_utils.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_static/obj/system/core/base/test_utils.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/test_utils.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_static/obj/system/libbase/test_utils.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7618,7 +7618,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7627,7 +7627,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7636,7 +7636,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7654,7 +7654,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -8599,7 +8599,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIPN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8608,7 +8608,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIPN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8617,7 +8617,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -8626,7 +8626,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8635,7 +8635,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -8644,7 +8644,7 @@
    "referenced_type" : "_ZTIN7android4base14CachedPropertyE",
    "self_type" : "_ZTIPN7android4base14CachedPropertyE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -8653,7 +8653,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8662,7 +8662,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8671,7 +8671,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8680,7 +8680,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8689,7 +8689,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8698,7 +8698,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8707,7 +8707,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8716,7 +8716,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8725,7 +8725,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8734,7 +8734,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8743,7 +8743,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8752,7 +8752,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8761,7 +8761,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8770,7 +8770,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIixEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8779,7 +8779,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8788,7 +8788,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIPN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8797,7 +8797,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIPN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -8806,7 +8806,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIPN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -8815,7 +8815,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPidsE",
    "self_type" : "_ZTIPN7android4base7AllPidsE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -8824,7 +8824,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -8833,7 +8833,7 @@
    "referenced_type" : "_ZTINSt3__117basic_string_viewIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIPNSt3__117basic_string_viewIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -8842,7 +8842,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEEE",
    "self_type" : "_ZTIPNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -8851,7 +8851,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8860,7 +8860,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8869,7 +8869,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIPb",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -8878,7 +8878,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -8887,7 +8887,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8896,7 +8896,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8905,7 +8905,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8914,7 +8914,7 @@
    "referenced_type" : "_ZTIs",
    "self_type" : "_ZTIPs",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8923,7 +8923,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8932,7 +8932,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8950,7 +8950,7 @@
    "referenced_type" : "_ZTIx",
    "self_type" : "_ZTIPx",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8959,7 +8959,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIPy",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   }
  ],
  "qualified_types" :
@@ -9134,7 +9134,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTIK13CapturedStdFd",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "is_const" : true,
@@ -9142,7 +9142,7 @@
    "name" : "const prop_info",
    "referenced_type" : "_ZTI9prop_info",
    "self_type" : "_ZTIK9prop_info",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -10894,7 +10894,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -10904,7 +10904,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -10914,7 +10914,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -10924,7 +10924,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -10934,7 +10934,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIKN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -10944,7 +10944,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -10954,7 +10954,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -10964,7 +10964,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -10984,7 +10984,7 @@
    "referenced_type" : "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "self_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -10994,7 +10994,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "self_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -11004,7 +11004,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIiNS_9allocatorIiEEEE",
    "self_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 1,
@@ -11064,7 +11064,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -11074,7 +11074,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -11084,7 +11084,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -11114,7 +11114,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -11124,7 +11124,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -11142,7 +11142,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -11188,7 +11188,7 @@
    "referenced_type" : "_ZTI12TemporaryDir",
    "self_type" : "_ZTI12TemporaryDir",
    "size" : 1025,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -11218,7 +11218,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTI13CapturedStdFd",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -11246,7 +11246,7 @@
    "referenced_type" : "_ZTI13TemporaryFile",
    "self_type" : "_ZTI13TemporaryFile",
    "size" : 1032,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -11262,7 +11262,7 @@
    "referenced_type" : "_ZTI14CapturedStderr",
    "self_type" : "_ZTI14CapturedStderr",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -11278,7 +11278,7 @@
    "referenced_type" : "_ZTI14CapturedStdout",
    "self_type" : "_ZTI14CapturedStdout",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -19592,7 +19592,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -19610,7 +19610,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -19640,7 +19640,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 1,
@@ -19650,7 +19650,7 @@
    "referenced_type" : "_ZTIN7android4base10boot_clockE",
    "self_type" : "_ZTIN7android4base10boot_clockE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -19667,7 +19667,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -19676,7 +19676,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -19694,7 +19694,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -19748,7 +19748,7 @@
    "referenced_type" : "_ZTIN7android4base14CachedPropertyE",
    "self_type" : "_ZTIN7android4base14CachedPropertyE",
    "size" : 132,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -19769,7 +19769,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -19791,7 +19791,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -19813,7 +19813,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -19835,7 +19835,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -19857,7 +19857,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -19879,7 +19879,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -19901,7 +19901,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -19923,7 +19923,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -19945,7 +19945,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -19967,7 +19967,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -19989,7 +19989,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -20011,7 +20011,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -20033,7 +20033,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -20055,7 +20055,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIx" ]
   },
   {
@@ -20074,7 +20074,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -20093,7 +20093,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -20111,7 +20111,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -20136,7 +20136,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 1,
@@ -20146,7 +20146,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPidsE",
    "self_type" : "_ZTIN7android4base7AllPidsE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -21028,7 +21028,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTION7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -21037,7 +21037,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -21046,7 +21046,7 @@
    "referenced_type" : "_ZTINSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "self_type" : "_ZTIONSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -21055,7 +21055,7 @@
    "referenced_type" : "_ZTINSt3__18functionIFvPKcEEE",
    "self_type" : "_ZTIONSt3__18functionIFvPKcEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
diff --git a/30/64/x86_64/source-based/libbase.so.lsdump b/30/64/x86_64/source-based/libbase.so.lsdump
index 948bae25..9797d396 100644
--- a/30/64/x86_64/source-based/libbase.so.lsdump
+++ b/30/64/x86_64/source-based/libbase.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA1024_c",
    "size" : 1024,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -224,7 +224,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA92_c",
    "size" : 92,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "linker_set_key" : "_ZTIA_c",
@@ -1856,7 +1856,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1881,7 +1881,7 @@
    "referenced_type" : "_ZTIN7android4base15ParseBoolResultE",
    "self_type" : "_ZTIN7android4base15ParseBoolResultE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsebool.h",
+   "source_file" : "/system/libbase/include/android-base/parsebool.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -1914,7 +1914,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -2375,7 +2375,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -2388,7 +2388,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -2401,7 +2401,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -2414,7 +2414,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -2427,7 +2427,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "CapturedStdFd::str",
@@ -2440,7 +2440,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Stop",
@@ -2453,7 +2453,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Reset",
@@ -2466,7 +2466,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Start",
@@ -2479,7 +2479,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -2495,7 +2495,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -2511,7 +2511,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -2524,7 +2524,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -2537,7 +2537,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "access" : "private",
@@ -2554,7 +2554,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::release",
@@ -2567,7 +2567,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2583,7 +2583,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2596,7 +2596,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2612,7 +2612,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2625,7 +2625,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -2638,7 +2638,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -2651,7 +2651,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "fmt::v6::format_error::~format_error",
@@ -3424,8 +3424,8 @@
      "referenced_type" : "_ZTIPN7android4base10LogMessageE"
     }
    ],
-   "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/logging.sdump",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/logging.sdump",
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogLine",
@@ -3449,7 +3449,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3477,7 +3477,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3508,7 +3508,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3536,7 +3536,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3567,7 +3567,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -3580,7 +3580,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -3593,7 +3593,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -3610,7 +3610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -3627,7 +3627,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::operator()",
@@ -3658,7 +3658,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromOsHandle",
@@ -3679,7 +3679,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__110unique_ptrIN7android4base10MappedFileENS_14default_deleteIS3_EEEE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "access" : "private",
@@ -3693,7 +3693,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromFd",
@@ -3714,7 +3714,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__110unique_ptrIN7android4base10MappedFileENS_14default_deleteIS3_EEEE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::MappedFile",
@@ -3730,7 +3730,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::MappedFile",
@@ -3746,7 +3746,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -3759,7 +3759,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -3772,7 +3772,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::operator=",
@@ -3788,7 +3788,7 @@
     }
    ],
    "return_type" : "_ZTIRN7android4base10MappedFileE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::SetAborter",
@@ -3800,7 +3800,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -3815,7 +3815,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -3830,7 +3830,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::WriteFully",
@@ -3848,13 +3848,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::boot_clock::now",
    "linker_set_key" : "_ZN7android4base10boot_clock3nowEv",
    "return_type" : "_ZTINSt3__16chrono10time_pointIN7android4base10boot_clockENS0_8durationIxNS_5ratioILl1ELl1000000000EEEEEEE",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "function_name" : "android::base::GetProperty",
@@ -3862,20 +3862,20 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/properties.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::GetThreadId",
    "linker_set_key" : "_ZN7android4base11GetThreadIdEv",
    "return_type" : "_ZTIm",
-   "source_file" : "/system/core/base/include/android-base/threads.h"
+   "source_file" : "/system/libbase/include/android-base/threads.h"
   },
   {
    "function_name" : "android::base::InitLogging",
@@ -3895,7 +3895,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetProperty",
@@ -3903,14 +3903,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/properties.sdump"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::StdioLogger",
@@ -3937,7 +3937,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::KernelLogger",
@@ -3964,7 +3964,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StderrLogger",
@@ -3991,7 +3991,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringPrintf",
@@ -4003,7 +4003,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::SetDefaultTag",
@@ -4011,11 +4011,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/logging.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/logging.sdump"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringAppendF",
@@ -4023,14 +4023,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/stringprintf.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/stringprintf.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringAppendV",
@@ -4038,7 +4038,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/stringprintf.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/stringprintf.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -4048,7 +4048,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringReplace",
@@ -4069,7 +4069,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::CachedProperty::Get",
@@ -4086,7 +4086,7 @@
     }
    ],
    "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
@@ -4102,7 +4102,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
@@ -4118,7 +4118,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::DefaultAborter",
@@ -4130,7 +4130,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ReadFdToString",
@@ -4145,7 +4145,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetBoolProperty",
@@ -4153,14 +4153,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/properties.sdump"
     },
     {
      "referenced_type" : "_ZTIb"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::ParseNetAddress",
@@ -4168,23 +4168,23 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
      "referenced_type" : "_ZTIPi"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/parsenetaddress.sdump"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "function_name" : "android::base::WaitForProperty",
@@ -4192,10 +4192,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/properties.sdump"
     },
     {
      "default_arg" : true,
@@ -4203,7 +4203,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::WriteStringToFd",
@@ -4218,7 +4218,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EqualsIgnoreCase",
@@ -4233,7 +4233,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::ReadFileToString",
@@ -4252,13 +4252,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetExecutablePath",
    "linker_set_key" : "_ZN7android4base17GetExecutablePathEv",
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ReadFullyAtOffset",
@@ -4279,7 +4279,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -4295,7 +4295,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -4311,7 +4311,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -4324,7 +4324,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -4337,7 +4337,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -4356,7 +4356,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -4384,7 +4384,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWithIgnoreCase",
@@ -4399,7 +4399,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::RemoveFileIfExists",
@@ -4415,7 +4415,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::StartsWithIgnoreCase",
@@ -4430,13 +4430,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::GetMinimumLogSeverity",
    "linker_set_key" : "_ZN7android4base21GetMinimumLogSeverityEv",
    "return_type" : "_ZTIN7android4base11LogSeverityE",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetMinimumLogSeverity",
@@ -4448,13 +4448,13 @@
     }
    ],
    "return_type" : "_ZTIN7android4base11LogSeverityE",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::GetExecutableDirectory",
    "linker_set_key" : "_ZN7android4base22GetExecutableDirectoryEv",
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SystemErrorCodeToString",
@@ -4466,7 +4466,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/errors.h"
+   "source_file" : "/system/libbase/include/android-base/errors.h"
   },
   {
    "function_name" : "android::base::WaitForPropertyCreation",
@@ -4474,7 +4474,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/properties.sdump"
     },
     {
      "default_arg" : true,
@@ -4482,7 +4482,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::SendFileDescriptorVector",
@@ -4503,7 +4503,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::ReceiveFileDescriptorVector",
@@ -4527,7 +4527,7 @@
     }
    ],
    "return_type" : "_ZTIl",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::Join",
@@ -4538,15 +4538,15 @@
      "referenced_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
-    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/strings.sdump"
+    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/strings.sdump"
    ]
   },
   {
@@ -4562,7 +4562,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
@@ -4578,15 +4578,15 @@
      "referenced_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
-    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/strings.sdump"
+    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/strings.sdump"
    ]
   },
   {
@@ -4602,7 +4602,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE", "_ZTIc" ]
   },
   {
@@ -4611,11 +4611,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Split",
@@ -4623,14 +4623,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/strings.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "access" : "private",
@@ -4644,7 +4644,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "function_name" : "android::base::Dirname",
@@ -4656,7 +4656,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Basename",
@@ -4668,7 +4668,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -4683,7 +4683,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -4698,7 +4698,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Readlink",
@@ -4713,7 +4713,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Realpath",
@@ -4728,7 +4728,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ParseBool",
@@ -4740,7 +4740,7 @@
     }
    ],
    "return_type" : "_ZTIN7android4base15ParseBoolResultE",
-   "source_file" : "/system/core/base/include/android-base/parsebool.h"
+   "source_file" : "/system/libbase/include/android-base/parsebool.h"
   },
   {
    "function_name" : "android::base::ParseUint",
@@ -4763,7 +4763,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIh" ]
   },
   {
@@ -4787,7 +4787,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIt" ]
   },
   {
@@ -4806,7 +4806,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SetLogger",
@@ -4818,7 +4818,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ShouldLog",
@@ -4833,7 +4833,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::operator<<",
@@ -4848,7 +4848,7 @@
     }
    ],
    "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -4862,7 +4862,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "fmt::v6::internal::locale_ref::get",
@@ -5179,7 +5179,7 @@
    "referenced_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIRKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -5188,7 +5188,7 @@
    "referenced_type" : "_ZTIKN7android4base5TimerE",
    "self_type" : "_ZTIRKN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -5197,7 +5197,7 @@
    "referenced_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIRKN7android4base7AllPids11PidIteratorE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 8,
@@ -5212,46 +5212,46 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/file.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/file.sdump",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/logging.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/logging.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/logging.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/logging.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/parsenetaddress.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/parsenetaddress.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/parsenetaddress.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/parsenetaddress.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/properties.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/properties.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/properties.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/properties.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/strings.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/strings.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/strings.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/strings.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -5278,16 +5278,16 @@
    "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/strings.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/strings.sdump",
+   "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/strings.sdump",
+   "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/strings.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -5296,16 +5296,16 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "name" : "const std::vector<const char *, std::allocator<const char *> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/strings.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/strings.sdump",
+   "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/strings.sdump",
+   "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/strings.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -5314,7 +5314,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -5323,16 +5323,16 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/cmsg.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/cmsg.sdump",
+   "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/cmsg.sdump",
+   "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/cmsg.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -5917,7 +5917,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIRN7android4base10MappedFileE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -5926,7 +5926,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIRN7android4base7AllPids11PidIteratorE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 8,
@@ -5935,7 +5935,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -6046,7 +6046,7 @@
    "referenced_type" : "_ZTI12TemporaryDir",
    "self_type" : "_ZTIP12TemporaryDir",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -6055,7 +6055,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTIP13CapturedStdFd",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -6064,7 +6064,7 @@
    "referenced_type" : "_ZTI13TemporaryFile",
    "self_type" : "_ZTIP13TemporaryFile",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -6073,7 +6073,7 @@
    "referenced_type" : "_ZTI13__va_list_tag",
    "self_type" : "_ZTIP13__va_list_tag",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "alignment" : 8,
@@ -6082,7 +6082,7 @@
    "referenced_type" : "_ZTI14CapturedStderr",
    "self_type" : "_ZTIP14CapturedStderr",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -6091,7 +6091,7 @@
    "referenced_type" : "_ZTI14CapturedStdout",
    "self_type" : "_ZTIP14CapturedStdout",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -6100,7 +6100,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -6109,7 +6109,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -6145,7 +6145,7 @@
    "referenced_type" : "_ZTIK13CapturedStdFd",
    "self_type" : "_ZTIPK13CapturedStdFd",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -6154,16 +6154,16 @@
    "referenced_type" : "_ZTIK9prop_info",
    "self_type" : "_ZTIPK9prop_info",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK9prop_info",
    "name" : "const prop_info *",
-   "referenced_type" : "_ZTIK9prop_info#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/properties.sdump",
-   "self_type" : "_ZTIPK9prop_info#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/properties.sdump",
+   "referenced_type" : "_ZTIK9prop_info#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/properties.sdump",
+   "self_type" : "_ZTIPK9prop_info#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/properties.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -8080,7 +8080,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -8089,7 +8089,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -8098,7 +8098,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -8107,7 +8107,7 @@
    "referenced_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -8116,7 +8116,7 @@
    "referenced_type" : "_ZTIKN7android4base5TimerE",
    "self_type" : "_ZTIPKN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -8125,7 +8125,7 @@
    "referenced_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIPKN7android4base7AllPids11PidIteratorE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 8,
@@ -8134,7 +8134,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -8143,43 +8143,43 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/cmsg.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/cmsg.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/cmsg.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/cmsg.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/file.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/file.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/file.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/file.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/logging.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/logging.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/logging.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/logging.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/test_utils.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_64_static/obj/system/core/base/test_utils.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/test_utils.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_64_static/obj/system/libbase/test_utils.sdump",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -8188,7 +8188,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -8197,7 +8197,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -8206,7 +8206,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -8224,7 +8224,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -9205,7 +9205,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIPN7android4base10LogMessageE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9214,7 +9214,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIPN7android4base10LogdLoggerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9223,7 +9223,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -9232,7 +9232,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -9241,7 +9241,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -9250,7 +9250,7 @@
    "referenced_type" : "_ZTIN7android4base14CachedPropertyE",
    "self_type" : "_ZTIPN7android4base14CachedPropertyE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -9259,7 +9259,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9268,7 +9268,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9277,7 +9277,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9286,7 +9286,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9295,7 +9295,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9304,7 +9304,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9313,7 +9313,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9322,7 +9322,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9331,7 +9331,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9340,7 +9340,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9349,7 +9349,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9358,7 +9358,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9367,7 +9367,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9376,7 +9376,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIilEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIilEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9385,7 +9385,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -9394,7 +9394,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIPN7android4base17ScopedLogSeverityE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9403,7 +9403,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIPN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -9412,7 +9412,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIPN7android4base7AllPids11PidIteratorE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 8,
@@ -9421,7 +9421,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPidsE",
    "self_type" : "_ZTIPN7android4base7AllPidsE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 8,
@@ -9430,7 +9430,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 8,
@@ -9439,7 +9439,7 @@
    "referenced_type" : "_ZTINSt3__117basic_string_viewIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIPNSt3__117basic_string_viewIcNS_11char_traitsIcEEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -9448,7 +9448,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEEE",
    "self_type" : "_ZTIPNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 8,
@@ -9457,7 +9457,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9466,7 +9466,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9475,7 +9475,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIPb",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -9484,7 +9484,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -9493,7 +9493,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -9502,7 +9502,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -9511,7 +9511,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -9520,7 +9520,7 @@
    "referenced_type" : "_ZTIl",
    "self_type" : "_ZTIPl",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -9529,7 +9529,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIPm",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -9538,7 +9538,7 @@
    "referenced_type" : "_ZTIs",
    "self_type" : "_ZTIPs",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -9547,7 +9547,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 8,
@@ -9556,7 +9556,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -9740,7 +9740,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTIK13CapturedStdFd",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "is_const" : true,
@@ -9748,7 +9748,7 @@
    "name" : "const prop_info",
    "referenced_type" : "_ZTI9prop_info",
    "self_type" : "_ZTIK9prop_info",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -11940,7 +11940,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -11950,7 +11950,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -11960,7 +11960,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -11970,7 +11970,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -11980,7 +11980,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIKN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 8,
@@ -11990,7 +11990,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 8,
@@ -12000,7 +12000,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -12010,7 +12010,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -12030,7 +12030,7 @@
    "referenced_type" : "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "self_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -12040,7 +12040,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "self_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 8,
@@ -12050,7 +12050,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIiNS_9allocatorIiEEEE",
    "self_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 1,
@@ -12110,7 +12110,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -12120,7 +12120,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -12130,7 +12130,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -12150,7 +12150,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -12160,7 +12160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -12188,7 +12188,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -12234,7 +12234,7 @@
    "referenced_type" : "_ZTI12TemporaryDir",
    "self_type" : "_ZTI12TemporaryDir",
    "size" : 1025,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -12264,7 +12264,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTI13CapturedStdFd",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -12292,7 +12292,7 @@
    "referenced_type" : "_ZTI13TemporaryFile",
    "self_type" : "_ZTI13TemporaryFile",
    "size" : 1032,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -12308,7 +12308,7 @@
    "referenced_type" : "_ZTI14CapturedStderr",
    "self_type" : "_ZTI14CapturedStderr",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -12324,7 +12324,7 @@
    "referenced_type" : "_ZTI14CapturedStdout",
    "self_type" : "_ZTI14CapturedStdout",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 8,
@@ -22018,7 +22018,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -22036,7 +22036,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -22066,7 +22066,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 1,
@@ -22076,7 +22076,7 @@
    "referenced_type" : "_ZTIN7android4base10boot_clockE",
    "self_type" : "_ZTIN7android4base10boot_clockE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -22093,7 +22093,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -22102,7 +22102,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -22120,7 +22120,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 8,
@@ -22174,7 +22174,7 @@
    "referenced_type" : "_ZTIN7android4base14CachedPropertyE",
    "self_type" : "_ZTIN7android4base14CachedPropertyE",
    "size" : 152,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 8,
@@ -22195,7 +22195,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -22217,7 +22217,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -22239,7 +22239,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -22261,7 +22261,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -22283,7 +22283,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -22305,7 +22305,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -22327,7 +22327,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -22349,7 +22349,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -22371,7 +22371,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -22393,7 +22393,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -22415,7 +22415,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -22437,7 +22437,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -22459,7 +22459,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -22481,7 +22481,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIilEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIilEE",
    "size" : 16,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIl" ]
   },
   {
@@ -22500,7 +22500,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -22519,7 +22519,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -22537,7 +22537,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -22562,7 +22562,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "size" : 24,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 1,
@@ -22572,7 +22572,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPidsE",
    "self_type" : "_ZTIN7android4base7AllPidsE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 8,
@@ -23670,7 +23670,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTION7android4base10MappedFileE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 8,
@@ -23679,7 +23679,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -23688,7 +23688,7 @@
    "referenced_type" : "_ZTINSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "self_type" : "_ZTIONSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
@@ -23697,7 +23697,7 @@
    "referenced_type" : "_ZTINSt3__18functionIFvPKcEEE",
    "self_type" : "_ZTIONSt3__18functionIFvPKcEEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
diff --git a/30/64/x86_x86_64/source-based/libbase.so.lsdump b/30/64/x86_x86_64/source-based/libbase.so.lsdump
index bd34e19b..2c633785 100644
--- a/30/64/x86_x86_64/source-based/libbase.so.lsdump
+++ b/30/64/x86_x86_64/source-based/libbase.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA1024_c",
    "size" : 1024,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -224,7 +224,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIA92_c",
    "size" : 92,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "linker_set_key" : "_ZTIA_c",
@@ -1777,7 +1777,7 @@
    "referenced_type" : "_ZTIN7android4base11LogSeverityE",
    "self_type" : "_ZTIN7android4base11LogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1802,7 +1802,7 @@
    "referenced_type" : "_ZTIN7android4base15ParseBoolResultE",
    "self_type" : "_ZTIN7android4base15ParseBoolResultE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsebool.h",
+   "source_file" : "/system/libbase/include/android-base/parsebool.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -1835,7 +1835,7 @@
    "referenced_type" : "_ZTIN7android4base5LogIdE",
    "self_type" : "_ZTIN7android4base5LogIdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -2194,7 +2194,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -2207,7 +2207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::TemporaryDir",
@@ -2220,7 +2220,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -2233,7 +2233,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryDir::~TemporaryDir",
@@ -2246,7 +2246,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "CapturedStdFd::str",
@@ -2259,7 +2259,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Stop",
@@ -2272,7 +2272,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Reset",
@@ -2285,7 +2285,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::Start",
@@ -2298,7 +2298,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -2314,7 +2314,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::CapturedStdFd",
@@ -2330,7 +2330,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -2343,7 +2343,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "CapturedStdFd::~CapturedStdFd",
@@ -2356,7 +2356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "access" : "private",
@@ -2373,7 +2373,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::release",
@@ -2386,7 +2386,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2402,7 +2402,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2415,7 +2415,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2431,7 +2431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::TemporaryFile",
@@ -2444,7 +2444,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -2457,7 +2457,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "TemporaryFile::~TemporaryFile",
@@ -2470,7 +2470,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "fmt::v6::format_error::~format_error",
@@ -3262,8 +3262,8 @@
      "referenced_type" : "_ZTIPN7android4base10LogMessageE"
     }
    ],
-   "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/logging.sdump",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/logging.sdump",
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogLine",
@@ -3287,7 +3287,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3315,7 +3315,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3346,7 +3346,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3374,7 +3374,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::LogMessage",
@@ -3405,7 +3405,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -3418,7 +3418,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogMessage::~LogMessage",
@@ -3431,7 +3431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -3448,7 +3448,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::LogdLogger",
@@ -3465,7 +3465,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::LogdLogger::operator()",
@@ -3496,7 +3496,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromOsHandle",
@@ -3517,7 +3517,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__110unique_ptrIN7android4base10MappedFileENS_14default_deleteIS3_EEEE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "access" : "private",
@@ -3531,7 +3531,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::FromFd",
@@ -3552,7 +3552,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__110unique_ptrIN7android4base10MappedFileENS_14default_deleteIS3_EEEE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::MappedFile",
@@ -3568,7 +3568,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::MappedFile",
@@ -3584,7 +3584,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -3597,7 +3597,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::~MappedFile",
@@ -3610,7 +3610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::MappedFile::operator=",
@@ -3626,7 +3626,7 @@
     }
    ],
    "return_type" : "_ZTIRN7android4base10MappedFileE",
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "function_name" : "android::base::SetAborter",
@@ -3638,7 +3638,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -3653,7 +3653,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::StartsWith",
@@ -3668,7 +3668,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::WriteFully",
@@ -3686,13 +3686,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::boot_clock::now",
    "linker_set_key" : "_ZN7android4base10boot_clock3nowEv",
    "return_type" : "_ZTINSt3__16chrono10time_pointIN7android4base10boot_clockENS0_8durationIxNS_5ratioILx1ELx1000000000EEEEEEE",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "function_name" : "android::base::GetProperty",
@@ -3700,20 +3700,20 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/properties.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::GetThreadId",
    "linker_set_key" : "_ZN7android4base11GetThreadIdEv",
    "return_type" : "_ZTIy",
-   "source_file" : "/system/core/base/include/android-base/threads.h"
+   "source_file" : "/system/libbase/include/android-base/threads.h"
   },
   {
    "function_name" : "android::base::InitLogging",
@@ -3733,7 +3733,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetProperty",
@@ -3741,14 +3741,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/properties.sdump"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::StdioLogger",
@@ -3775,7 +3775,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::KernelLogger",
@@ -3802,7 +3802,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StderrLogger",
@@ -3829,7 +3829,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringPrintf",
@@ -3841,7 +3841,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::SetDefaultTag",
@@ -3849,11 +3849,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/logging.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/logging.sdump"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::StringAppendF",
@@ -3861,14 +3861,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/stringprintf.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/stringprintf.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringAppendV",
@@ -3876,7 +3876,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/stringprintf.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/stringprintf.sdump"
     },
     {
      "referenced_type" : "_ZTIPKc"
@@ -3886,7 +3886,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/stringprintf.h"
+   "source_file" : "/system/libbase/include/android-base/stringprintf.h"
   },
   {
    "function_name" : "android::base::StringReplace",
@@ -3907,7 +3907,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::CachedProperty::Get",
@@ -3924,7 +3924,7 @@
     }
    ],
    "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
@@ -3940,7 +3940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::CachedProperty::CachedProperty",
@@ -3956,7 +3956,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::DefaultAborter",
@@ -3968,7 +3968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ReadFdToString",
@@ -3983,7 +3983,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetBoolProperty",
@@ -3991,14 +3991,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/properties.sdump"
     },
     {
      "referenced_type" : "_ZTIb"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::ParseNetAddress",
@@ -4006,23 +4006,23 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
      "referenced_type" : "_ZTIPi"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/parsenetaddress.sdump"
     },
     {
-     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/parsenetaddress.sdump"
+     "referenced_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/parsenetaddress.sdump"
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "function_name" : "android::base::WaitForProperty",
@@ -4030,10 +4030,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/properties.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/properties.sdump"
     },
     {
      "default_arg" : true,
@@ -4041,7 +4041,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::WriteStringToFd",
@@ -4056,7 +4056,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EqualsIgnoreCase",
@@ -4071,7 +4071,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::ReadFileToString",
@@ -4090,13 +4090,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::GetExecutablePath",
    "linker_set_key" : "_ZN7android4base17GetExecutablePathEv",
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ReadFullyAtOffset",
@@ -4117,7 +4117,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -4133,7 +4133,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::ScopedLogSeverity",
@@ -4149,7 +4149,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -4162,7 +4162,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ScopedLogSeverity::~ScopedLogSeverity",
@@ -4175,7 +4175,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -4194,7 +4194,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::WriteStringToFile",
@@ -4222,7 +4222,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWithIgnoreCase",
@@ -4237,7 +4237,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::RemoveFileIfExists",
@@ -4253,7 +4253,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::StartsWithIgnoreCase",
@@ -4268,13 +4268,13 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::GetMinimumLogSeverity",
    "linker_set_key" : "_ZN7android4base21GetMinimumLogSeverityEv",
    "return_type" : "_ZTIN7android4base11LogSeverityE",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::SetMinimumLogSeverity",
@@ -4286,13 +4286,13 @@
     }
    ],
    "return_type" : "_ZTIN7android4base11LogSeverityE",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::GetExecutableDirectory",
    "linker_set_key" : "_ZN7android4base22GetExecutableDirectoryEv",
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SystemErrorCodeToString",
@@ -4304,7 +4304,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/errors.h"
+   "source_file" : "/system/libbase/include/android-base/errors.h"
   },
   {
    "function_name" : "android::base::WaitForPropertyCreation",
@@ -4312,7 +4312,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/properties.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/properties.sdump"
     },
     {
      "default_arg" : true,
@@ -4320,7 +4320,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "function_name" : "android::base::SendFileDescriptorVector",
@@ -4341,7 +4341,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::ReceiveFileDescriptorVector",
@@ -4365,7 +4365,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "function_name" : "android::base::Join",
@@ -4376,15 +4376,15 @@
      "referenced_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
-    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/strings.sdump"
+    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/strings.sdump"
    ]
   },
   {
@@ -4400,7 +4400,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
@@ -4416,15 +4416,15 @@
      "referenced_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" :
    [
     "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
-    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/strings.sdump"
+    "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/strings.sdump"
    ]
   },
   {
@@ -4440,7 +4440,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h",
+   "source_file" : "/system/libbase/include/android-base/strings.h",
    "template_args" : [ "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE", "_ZTIc" ]
   },
   {
@@ -4449,11 +4449,11 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Split",
@@ -4461,14 +4461,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/strings.sdump"
     },
     {
-     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/strings.sdump"
+     "referenced_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/strings.sdump"
     }
    ],
    "return_type" : "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "access" : "private",
@@ -4482,7 +4482,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "function_name" : "android::base::Dirname",
@@ -4494,7 +4494,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Basename",
@@ -4506,7 +4506,7 @@
     }
    ],
    "return_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -4521,7 +4521,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::EndsWith",
@@ -4536,7 +4536,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "function_name" : "android::base::Readlink",
@@ -4551,7 +4551,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::Realpath",
@@ -4566,7 +4566,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::ParseBool",
@@ -4578,7 +4578,7 @@
     }
    ],
    "return_type" : "_ZTIN7android4base15ParseBoolResultE",
-   "source_file" : "/system/core/base/include/android-base/parsebool.h"
+   "source_file" : "/system/libbase/include/android-base/parsebool.h"
   },
   {
    "function_name" : "android::base::ParseUint",
@@ -4601,7 +4601,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIh" ]
   },
   {
@@ -4625,7 +4625,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIj" ]
   },
   {
@@ -4649,7 +4649,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/parseint.h",
+   "source_file" : "/system/libbase/include/android-base/parseint.h",
    "template_args" : [ "_ZTIt" ]
   },
   {
@@ -4668,7 +4668,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "function_name" : "android::base::SetLogger",
@@ -4680,7 +4680,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::ShouldLog",
@@ -4695,7 +4695,7 @@
     }
    ],
    "return_type" : "_ZTIb",
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "function_name" : "android::base::operator<<",
@@ -4710,7 +4710,7 @@
     }
    ],
    "return_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -4724,7 +4724,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "function_name" : "fmt::v6::internal::locale_ref::get",
@@ -5041,7 +5041,7 @@
    "referenced_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIRKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5050,7 +5050,7 @@
    "referenced_type" : "_ZTIKN7android4base5TimerE",
    "self_type" : "_ZTIRKN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -5059,7 +5059,7 @@
    "referenced_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIRKN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -5074,46 +5074,46 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/file.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/file.sdump",
    "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/logging.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/logging.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/logging.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/logging.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/parsenetaddress.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/parsenetaddress.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/parsenetaddress.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/parsenetaddress.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parsenetaddress.h"
+   "source_file" : "/system/libbase/include/android-base/parsenetaddress.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/properties.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/properties.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/properties.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/properties.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/strings.sdump",
-   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/strings.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/strings.sdump",
+   "self_type" : "_ZTIRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/strings.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5140,7 +5140,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5149,7 +5149,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5158,7 +5158,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5167,7 +5167,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -5176,7 +5176,7 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -5185,16 +5185,16 @@
    "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:",
    "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/cmsg.sdump",
-   "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/cmsg.sdump",
+   "referenced_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/cmsg.sdump",
+   "self_type" : "_ZTIRKNSt3__16vectorIiNS_9allocatorIiEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/cmsg.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -5752,7 +5752,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIRN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -5761,7 +5761,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIRN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -5770,7 +5770,7 @@
    "referenced_type" : "_ZTINSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -5881,7 +5881,7 @@
    "referenced_type" : "_ZTI12TemporaryDir",
    "self_type" : "_ZTIP12TemporaryDir",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -5890,7 +5890,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTIP13CapturedStdFd",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5899,7 +5899,7 @@
    "referenced_type" : "_ZTI13TemporaryFile",
    "self_type" : "_ZTIP13TemporaryFile",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -5908,7 +5908,7 @@
    "referenced_type" : "_ZTI14CapturedStderr",
    "self_type" : "_ZTIP14CapturedStderr",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5917,7 +5917,7 @@
    "referenced_type" : "_ZTI14CapturedStdout",
    "self_type" : "_ZTIP14CapturedStdout",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5926,7 +5926,7 @@
    "referenced_type" : "_ZTI3DIR",
    "self_type" : "_ZTIP3DIR",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5935,7 +5935,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -5971,7 +5971,7 @@
    "referenced_type" : "_ZTIK13CapturedStdFd",
    "self_type" : "_ZTIPK13CapturedStdFd",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -5980,7 +5980,7 @@
    "referenced_type" : "_ZTIK9prop_info",
    "self_type" : "_ZTIPK9prop_info",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -5989,7 +5989,7 @@
    "referenced_type" : "_ZTIK9prop_info#ODR:",
    "self_type" : "_ZTIPK9prop_info#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -7510,7 +7510,7 @@
    "referenced_type" : "_ZTIKN7android4base10MappedFileE",
    "self_type" : "_ZTIPKN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -7519,7 +7519,7 @@
    "referenced_type" : "_ZTIKN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7528,7 +7528,7 @@
    "referenced_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -7537,7 +7537,7 @@
    "referenced_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7546,7 +7546,7 @@
    "referenced_type" : "_ZTIKN7android4base5TimerE",
    "self_type" : "_ZTIPKN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -7555,7 +7555,7 @@
    "referenced_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIPKN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -7564,7 +7564,7 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7573,43 +7573,43 @@
    "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
    "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/cmsg.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/cmsg.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/cmsg.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/cmsg.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/file.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/file.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/file.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/file.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/logging.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/logging.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/logging.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/logging.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/test_utils.sdump",
-   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/core/base/libbase/android_vendor.R_x86_x86_64_static/obj/system/core/base/test_utils.sdump",
+   "referenced_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/test_utils.sdump",
+   "self_type" : "_ZTIPKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE#ODR:out/soong/.intermediates/system/libbase/libbase/android_vendor.R_x86_x86_64_static/obj/system/libbase/test_utils.sdump",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7618,7 +7618,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7627,7 +7627,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -7636,7 +7636,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -7654,7 +7654,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -8599,7 +8599,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIPN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8608,7 +8608,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIPN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8617,7 +8617,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIPN7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -8626,7 +8626,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIPN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8635,7 +8635,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIPN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -8644,7 +8644,7 @@
    "referenced_type" : "_ZTIN7android4base14CachedPropertyE",
    "self_type" : "_ZTIPN7android4base14CachedPropertyE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -8653,7 +8653,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8662,7 +8662,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8671,7 +8671,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8680,7 +8680,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8689,7 +8689,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8698,7 +8698,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8707,7 +8707,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8716,7 +8716,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8725,7 +8725,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8734,7 +8734,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8743,7 +8743,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8752,7 +8752,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8761,7 +8761,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIiiEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8770,7 +8770,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "self_type" : "_ZTIPN7android4base14EagerEvaluatorIixEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8779,7 +8779,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIPN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8788,7 +8788,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIPN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8797,7 +8797,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIPN7android4base5TimerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -8806,7 +8806,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIPN7android4base7AllPids11PidIteratorE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -8815,7 +8815,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPidsE",
    "self_type" : "_ZTIPN7android4base7AllPidsE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -8824,7 +8824,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIPNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -8833,7 +8833,7 @@
    "referenced_type" : "_ZTINSt3__117basic_string_viewIcNS_11char_traitsIcEEEE",
    "self_type" : "_ZTIPNSt3__117basic_string_viewIcNS_11char_traitsIcEEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -8842,7 +8842,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEEE",
    "self_type" : "_ZTIPNSt3__16vectorIN7android4base14unique_fd_implINS2_13DefaultCloserEEENS_9allocatorIS5_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -8851,7 +8851,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8860,7 +8860,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIPa",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8869,7 +8869,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIPb",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -8878,7 +8878,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -8887,7 +8887,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -8896,7 +8896,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8905,7 +8905,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8914,7 +8914,7 @@
    "referenced_type" : "_ZTIs",
    "self_type" : "_ZTIPs",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8923,7 +8923,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8932,7 +8932,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -8950,7 +8950,7 @@
    "referenced_type" : "_ZTIx",
    "self_type" : "_ZTIPx",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   },
   {
    "alignment" : 4,
@@ -8959,7 +8959,7 @@
    "referenced_type" : "_ZTIy",
    "self_type" : "_ZTIPy",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/parseint.h"
+   "source_file" : "/system/libbase/include/android-base/parseint.h"
   }
  ],
  "qualified_types" :
@@ -9134,7 +9134,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTIK13CapturedStdFd",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "is_const" : true,
@@ -9142,7 +9142,7 @@
    "name" : "const prop_info",
    "referenced_type" : "_ZTI9prop_info",
    "self_type" : "_ZTIK9prop_info",
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -10894,7 +10894,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIKN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -10904,7 +10904,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIKN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -10914,7 +10914,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIKN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -10924,7 +10924,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIKN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -10934,7 +10934,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIKN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -10944,7 +10944,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIKN7android4base7AllPids11PidIteratorE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -10954,7 +10954,7 @@
    "referenced_type" : "_ZTINSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "self_type" : "_ZTIKNSt3__110unique_ptrIN7android4base14LogMessageDataENS_14default_deleteIS3_EEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -10964,7 +10964,7 @@
    "referenced_type" : "_ZTINSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "self_type" : "_ZTIKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -10984,7 +10984,7 @@
    "referenced_type" : "_ZTINSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "self_type" : "_ZTIKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -10994,7 +10994,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "self_type" : "_ZTIKNSt3__16vectorIPKcNS_9allocatorIS2_EEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/strings.h"
+   "source_file" : "/system/libbase/include/android-base/strings.h"
   },
   {
    "alignment" : 4,
@@ -11004,7 +11004,7 @@
    "referenced_type" : "_ZTINSt3__16vectorIiNS_9allocatorIiEEEE",
    "self_type" : "_ZTIKNSt3__16vectorIiNS_9allocatorIiEEEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 1,
@@ -11064,7 +11064,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -11074,7 +11074,7 @@
    "referenced_type" : "_ZTIb",
    "self_type" : "_ZTIKb",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 1,
@@ -11084,7 +11084,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -11114,7 +11114,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -11124,7 +11124,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -11142,7 +11142,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "/system/core/base/include/android-base/cmsg.h"
+   "source_file" : "/system/libbase/include/android-base/cmsg.h"
   },
   {
    "alignment" : 4,
@@ -11188,7 +11188,7 @@
    "referenced_type" : "_ZTI12TemporaryDir",
    "self_type" : "_ZTI12TemporaryDir",
    "size" : 1025,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -11218,7 +11218,7 @@
    "referenced_type" : "_ZTI13CapturedStdFd",
    "self_type" : "_ZTI13CapturedStdFd",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -11246,7 +11246,7 @@
    "referenced_type" : "_ZTI13TemporaryFile",
    "self_type" : "_ZTI13TemporaryFile",
    "size" : 1032,
-   "source_file" : "/system/core/base/include/android-base/file.h"
+   "source_file" : "/system/libbase/include/android-base/file.h"
   },
   {
    "alignment" : 4,
@@ -11262,7 +11262,7 @@
    "referenced_type" : "_ZTI14CapturedStderr",
    "self_type" : "_ZTI14CapturedStderr",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -11278,7 +11278,7 @@
    "referenced_type" : "_ZTI14CapturedStdout",
    "self_type" : "_ZTI14CapturedStdout",
    "size" : 1040,
-   "source_file" : "/system/core/base/include/android-base/test_utils.h"
+   "source_file" : "/system/libbase/include/android-base/test_utils.h"
   },
   {
    "alignment" : 4,
@@ -19592,7 +19592,7 @@
    "referenced_type" : "_ZTIN7android4base10LogMessageE",
    "self_type" : "_ZTIN7android4base10LogMessageE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -19610,7 +19610,7 @@
    "referenced_type" : "_ZTIN7android4base10LogdLoggerE",
    "self_type" : "_ZTIN7android4base10LogdLoggerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -19640,7 +19640,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTIN7android4base10MappedFileE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 1,
@@ -19650,7 +19650,7 @@
    "referenced_type" : "_ZTIN7android4base10boot_clockE",
    "self_type" : "_ZTIN7android4base10boot_clockE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "alignment" : 4,
@@ -19667,7 +19667,7 @@
    "referenced_type" : "_ZTIN7android4base11borrowed_fdE",
    "self_type" : "_ZTIN7android4base11borrowed_fdE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 1,
@@ -19676,7 +19676,7 @@
    "referenced_type" : "_ZTIN7android4base13DefaultCloserE",
    "self_type" : "_ZTIN7android4base13DefaultCloserE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -19694,7 +19694,7 @@
    "referenced_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "self_type" : "_ZTIN7android4base13ErrnoRestorerE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/errno_restorer.h"
+   "source_file" : "/system/libbase/include/android-base/errno_restorer.h"
   },
   {
    "alignment" : 4,
@@ -19748,7 +19748,7 @@
    "referenced_type" : "_ZTIN7android4base14CachedPropertyE",
    "self_type" : "_ZTIN7android4base14CachedPropertyE",
    "size" : 132,
-   "source_file" : "/system/core/base/include/android-base/properties.h"
+   "source_file" : "/system/libbase/include/android-base/properties.h"
   },
   {
    "alignment" : 4,
@@ -19769,7 +19769,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaPaEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPa" ]
   },
   {
@@ -19791,7 +19791,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKaS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKa", "_ZTIPKa" ]
   },
   {
@@ -19813,7 +19813,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcPcEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPc" ]
   },
   {
@@ -19835,7 +19835,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKcS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKc", "_ZTIPKc" ]
   },
   {
@@ -19857,7 +19857,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhPhEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPh" ]
   },
   {
@@ -19879,7 +19879,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPKhS3_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPKh", "_ZTIPKh" ]
   },
   {
@@ -19901,7 +19901,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaPKaEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPKa" ]
   },
   {
@@ -19923,7 +19923,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPaS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPa", "_ZTIPa" ]
   },
   {
@@ -19945,7 +19945,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcPKcEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPKc" ]
   },
   {
@@ -19967,7 +19967,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPcS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPc", "_ZTIPc" ]
   },
   {
@@ -19989,7 +19989,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhPKhEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPKh" ]
   },
   {
@@ -20011,7 +20011,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIPhS2_EE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIPh", "_ZTIPh" ]
   },
   {
@@ -20033,7 +20033,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIiiEE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIi" ]
   },
   {
@@ -20055,7 +20055,7 @@
    "referenced_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "self_type" : "_ZTIN7android4base14EagerEvaluatorIixEE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "source_file" : "/system/libbase/include/android-base/logging.h",
    "template_args" : [ "_ZTIi", "_ZTIx" ]
   },
   {
@@ -20074,7 +20074,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
    "template_args" : [ "_ZTIN7android4base13DefaultCloserE" ]
   },
   {
@@ -20093,7 +20093,7 @@
    "referenced_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "self_type" : "_ZTIN7android4base17ScopedLogSeverityE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -20111,7 +20111,7 @@
    "referenced_type" : "_ZTIN7android4base5TimerE",
    "self_type" : "_ZTIN7android4base5TimerE",
    "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/chrono_utils.h"
+   "source_file" : "/system/libbase/include/android-base/chrono_utils.h"
   },
   {
    "access" : "private",
@@ -20136,7 +20136,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "self_type" : "_ZTIN7android4base7AllPids11PidIteratorE",
    "size" : 12,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 1,
@@ -20146,7 +20146,7 @@
    "referenced_type" : "_ZTIN7android4base7AllPidsE",
    "self_type" : "_ZTIN7android4base7AllPidsE",
    "size" : 1,
-   "source_file" : "/system/core/base/include/android-base/process.h"
+   "source_file" : "/system/libbase/include/android-base/process.h"
   },
   {
    "alignment" : 4,
@@ -21028,7 +21028,7 @@
    "referenced_type" : "_ZTIN7android4base10MappedFileE",
    "self_type" : "_ZTION7android4base10MappedFileE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/mapped_file.h"
+   "source_file" : "/system/libbase/include/android-base/mapped_file.h"
   },
   {
    "alignment" : 4,
@@ -21037,7 +21037,7 @@
    "referenced_type" : "_ZTIN7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "self_type" : "_ZTION7android4base14unique_fd_implINS0_13DefaultCloserEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -21046,7 +21046,7 @@
    "referenced_type" : "_ZTINSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "self_type" : "_ZTIONSt3__18functionIFvN7android4base5LogIdENS2_11LogSeverityEPKcS6_jS6_EEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
@@ -21055,7 +21055,7 @@
    "referenced_type" : "_ZTINSt3__18functionIFvPKcEEE",
    "self_type" : "_ZTIONSt3__18functionIFvPKcEEE",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/logging.h"
+   "source_file" : "/system/libbase/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
author	Xin Li <delphij@google.com>	2021-03-02 15:49:54 -0800
committer	Xin Li <delphij@google.com>	2021-03-03 09:12:27 -0800
commit	06bc70f4871ce23b19931c8e9d2633da240383b4 (patch)
tree	82530bb438dcba1f4284df74b06527b90848c8f6
parent	ae0dfec78a2678cd986e92000335de529453002b (diff)
parent	116a8add8ceeb82479a50bfdeeadf7b5ad34680a (diff)
download	vndk-android-s-beta-3.tar.gz