diff --git a/29/32/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
index f0a641d..21e347e 100644
--- a/29/32/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
+++ b/29/32/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
@@ -16310,7 +16310,7 @@
    "referenced_type" : "type-2188",
    "self_type" : "type-2187",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16319,7 +16319,7 @@
    "referenced_type" : "type-2414",
    "self_type" : "type-2413",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16328,7 +16328,7 @@
    "referenced_type" : "type-255",
    "self_type" : "type-254",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16337,7 +16337,7 @@
    "referenced_type" : "type-2614",
    "self_type" : "type-2613",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16643,7 +16643,7 @@
    "referenced_type" : "type-2186",
    "self_type" : "type-2185",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16652,7 +16652,7 @@
    "referenced_type" : "type-2412",
    "self_type" : "type-2411",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16661,7 +16661,7 @@
    "referenced_type" : "type-252",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16670,7 +16670,7 @@
    "referenced_type" : "type-2612",
    "self_type" : "type-2611",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -18236,7 +18236,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-250",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -54857,7 +54857,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-248",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -54876,7 +54876,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-249",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -61556,7 +61556,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-253",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/32/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
index c3d2ba9..6f91b3b 100644
--- a/29/32/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
+++ b/29/32/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
@@ -16418,7 +16418,7 @@
    "referenced_type" : "type-2188",
    "self_type" : "type-2187",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16427,7 +16427,7 @@
    "referenced_type" : "type-2414",
    "self_type" : "type-2413",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16436,7 +16436,7 @@
    "referenced_type" : "type-255",
    "self_type" : "type-254",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16445,7 +16445,7 @@
    "referenced_type" : "type-2614",
    "self_type" : "type-2613",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16751,7 +16751,7 @@
    "referenced_type" : "type-2186",
    "self_type" : "type-2185",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16760,7 +16760,7 @@
    "referenced_type" : "type-2412",
    "self_type" : "type-2411",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16769,7 +16769,7 @@
    "referenced_type" : "type-252",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16778,7 +16778,7 @@
    "referenced_type" : "type-2612",
    "self_type" : "type-2611",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -18344,7 +18344,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-250",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -54965,7 +54965,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-248",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -54984,7 +54984,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-249",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -61664,7 +61664,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-253",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/32/arm_armv7-a-neon/source-based/libmediandk.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
index 138814b..0e2c927 100644
--- a/29/32/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
+++ b/29/32/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
@@ -14969,7 +14969,7 @@
    "referenced_type" : "type-1036",
    "self_type" : "type-1035",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14978,7 +14978,7 @@
    "referenced_type" : "type-1469",
    "self_type" : "type-1468",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14987,7 +14987,7 @@
    "referenced_type" : "type-1845",
    "self_type" : "type-1844",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14996,7 +14996,7 @@
    "referenced_type" : "type-2272",
    "self_type" : "type-2271",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15005,7 +15005,7 @@
    "referenced_type" : "type-2749",
    "self_type" : "type-2748",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15014,7 +15014,7 @@
    "referenced_type" : "type-2976",
    "self_type" : "type-2975",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15023,7 +15023,7 @@
    "referenced_type" : "type-3130",
    "self_type" : "type-3129",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15032,7 +15032,7 @@
    "referenced_type" : "type-3383",
    "self_type" : "type-3382",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15041,7 +15041,7 @@
    "referenced_type" : "type-3472",
    "self_type" : "type-3471",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15050,7 +15050,7 @@
    "referenced_type" : "type-3635",
    "self_type" : "type-3634",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15059,7 +15059,7 @@
    "referenced_type" : "type-3749",
    "self_type" : "type-3748",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15068,7 +15068,7 @@
    "referenced_type" : "type-384",
    "self_type" : "type-383",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15077,7 +15077,7 @@
    "referenced_type" : "type-3989",
    "self_type" : "type-3988",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15086,7 +15086,7 @@
    "referenced_type" : "type-4304",
    "self_type" : "type-4303",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15095,7 +15095,7 @@
    "referenced_type" : "type-4457",
    "self_type" : "type-4456",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15104,7 +15104,7 @@
    "referenced_type" : "type-798",
    "self_type" : "type-797",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15176,7 +15176,7 @@
    "referenced_type" : "type-1034",
    "self_type" : "type-1033",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15185,7 +15185,7 @@
    "referenced_type" : "type-1467",
    "self_type" : "type-1466",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15194,7 +15194,7 @@
    "referenced_type" : "type-1843",
    "self_type" : "type-1842",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15203,7 +15203,7 @@
    "referenced_type" : "type-2266",
    "self_type" : "type-2265",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15212,7 +15212,7 @@
    "referenced_type" : "type-2747",
    "self_type" : "type-2746",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15221,7 +15221,7 @@
    "referenced_type" : "type-2974",
    "self_type" : "type-2973",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15230,7 +15230,7 @@
    "referenced_type" : "type-3128",
    "self_type" : "type-3127",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15239,7 +15239,7 @@
    "referenced_type" : "type-3381",
    "self_type" : "type-3380",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15248,7 +15248,7 @@
    "referenced_type" : "type-3470",
    "self_type" : "type-3469",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15257,7 +15257,7 @@
    "referenced_type" : "type-3633",
    "self_type" : "type-3632",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15266,7 +15266,7 @@
    "referenced_type" : "type-3747",
    "self_type" : "type-3746",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15275,7 +15275,7 @@
    "referenced_type" : "type-382",
    "self_type" : "type-381",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15284,7 +15284,7 @@
    "referenced_type" : "type-3987",
    "self_type" : "type-3986",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15293,7 +15293,7 @@
    "referenced_type" : "type-4302",
    "self_type" : "type-4301",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15302,7 +15302,7 @@
    "referenced_type" : "type-4454",
    "self_type" : "type-4453",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15311,7 +15311,7 @@
    "referenced_type" : "type-796",
    "self_type" : "type-795",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -18812,7 +18812,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2262",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -21134,7 +21134,7 @@
    "referenced_type" : "type-2263",
    "self_type" : "type-2264",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -24802,7 +24802,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2263",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -44495,7 +44495,7 @@
    "referenced_type" : "type-359",
    "self_type" : "type-359",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -44514,7 +44514,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-358",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -53187,7 +53187,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2270",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/32/x86/source-based/libOpenMAXAL.so.lsdump b/29/32/x86/source-based/libOpenMAXAL.so.lsdump
index 0dd04e4..4ab6ac6 100644
--- a/29/32/x86/source-based/libOpenMAXAL.so.lsdump
+++ b/29/32/x86/source-based/libOpenMAXAL.so.lsdump
@@ -16148,7 +16148,7 @@
    "referenced_type" : "type-2188",
    "self_type" : "type-2187",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16157,7 +16157,7 @@
    "referenced_type" : "type-255",
    "self_type" : "type-254",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16463,7 +16463,7 @@
    "referenced_type" : "type-2186",
    "self_type" : "type-2185",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16472,7 +16472,7 @@
    "referenced_type" : "type-252",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -17678,7 +17678,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-250",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -53947,7 +53947,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-248",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -53966,7 +53966,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-249",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -60646,7 +60646,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-253",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/32/x86/source-based/libOpenSLES.so.lsdump b/29/32/x86/source-based/libOpenSLES.so.lsdump
index b755e17..3229d0e 100644
--- a/29/32/x86/source-based/libOpenSLES.so.lsdump
+++ b/29/32/x86/source-based/libOpenSLES.so.lsdump
@@ -16256,7 +16256,7 @@
    "referenced_type" : "type-2188",
    "self_type" : "type-2187",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16265,7 +16265,7 @@
    "referenced_type" : "type-255",
    "self_type" : "type-254",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16571,7 +16571,7 @@
    "referenced_type" : "type-2186",
    "self_type" : "type-2185",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16580,7 +16580,7 @@
    "referenced_type" : "type-252",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -17786,7 +17786,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-250",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -54055,7 +54055,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-248",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -54074,7 +54074,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-249",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -60754,7 +60754,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-253",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/32/x86/source-based/libmediandk.so.lsdump b/29/32/x86/source-based/libmediandk.so.lsdump
index 6553a35..29188e2 100644
--- a/29/32/x86/source-based/libmediandk.so.lsdump
+++ b/29/32/x86/source-based/libmediandk.so.lsdump
@@ -14374,7 +14374,7 @@
    "referenced_type" : "type-1036",
    "self_type" : "type-1035",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14383,7 +14383,7 @@
    "referenced_type" : "type-1367",
    "self_type" : "type-1366",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14392,7 +14392,7 @@
    "referenced_type" : "type-1463",
    "self_type" : "type-1462",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14401,7 +14401,7 @@
    "referenced_type" : "type-1645",
    "self_type" : "type-1644",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14410,7 +14410,7 @@
    "referenced_type" : "type-1767",
    "self_type" : "type-1766",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14419,7 +14419,7 @@
    "referenced_type" : "type-2131",
    "self_type" : "type-2130",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14428,7 +14428,7 @@
    "referenced_type" : "type-2516",
    "self_type" : "type-2515",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14437,7 +14437,7 @@
    "referenced_type" : "type-2746",
    "self_type" : "type-2745",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14446,7 +14446,7 @@
    "referenced_type" : "type-384",
    "self_type" : "type-383",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14455,7 +14455,7 @@
    "referenced_type" : "type-798",
    "self_type" : "type-797",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14509,7 +14509,7 @@
    "referenced_type" : "type-1034",
    "self_type" : "type-1033",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14518,7 +14518,7 @@
    "referenced_type" : "type-1365",
    "self_type" : "type-1364",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14527,7 +14527,7 @@
    "referenced_type" : "type-1461",
    "self_type" : "type-1460",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14536,7 +14536,7 @@
    "referenced_type" : "type-1640",
    "self_type" : "type-1639",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14545,7 +14545,7 @@
    "referenced_type" : "type-1765",
    "self_type" : "type-1764",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14554,7 +14554,7 @@
    "referenced_type" : "type-2129",
    "self_type" : "type-2128",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14563,7 +14563,7 @@
    "referenced_type" : "type-2514",
    "self_type" : "type-2513",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14572,7 +14572,7 @@
    "referenced_type" : "type-2740",
    "self_type" : "type-2739",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14581,7 +14581,7 @@
    "referenced_type" : "type-382",
    "self_type" : "type-381",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14590,7 +14590,7 @@
    "referenced_type" : "type-796",
    "self_type" : "type-795",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -17155,7 +17155,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2736",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -19189,7 +19189,7 @@
    "referenced_type" : "type-2737",
    "self_type" : "type-2738",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -22402,7 +22402,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2737",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -40927,7 +40927,7 @@
    "referenced_type" : "type-359",
    "self_type" : "type-359",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -40946,7 +40946,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-358",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -49619,7 +49619,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2744",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/64/arm64_armv8-a/source-based/libOpenMAXAL.so.lsdump b/29/64/arm64_armv8-a/source-based/libOpenMAXAL.so.lsdump
index 9c772b2..f89583d 100644
--- a/29/64/arm64_armv8-a/source-based/libOpenMAXAL.so.lsdump
+++ b/29/64/arm64_armv8-a/source-based/libOpenMAXAL.so.lsdump
@@ -16149,7 +16149,7 @@
    "referenced_type" : "type-2190",
    "self_type" : "type-2189",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -16158,7 +16158,7 @@
    "referenced_type" : "type-257",
    "self_type" : "type-256",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -16464,7 +16464,7 @@
    "referenced_type" : "type-2188",
    "self_type" : "type-2187",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -16473,7 +16473,7 @@
    "referenced_type" : "type-254",
    "self_type" : "type-253",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -17679,7 +17679,7 @@
    "referenced_type" : "type-251",
    "self_type" : "type-252",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -53967,7 +53967,7 @@
    "referenced_type" : "type-250",
    "self_type" : "type-250",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -53986,7 +53986,7 @@
    "referenced_type" : "type-251",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-250" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -60666,7 +60666,7 @@
    "referenced_type" : "type-251",
    "self_type" : "type-255",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
diff --git a/29/64/arm64_armv8-a/source-based/libOpenSLES.so.lsdump b/29/64/arm64_armv8-a/source-based/libOpenSLES.so.lsdump
index 2e31c02..b35ebda 100644
--- a/29/64/arm64_armv8-a/source-based/libOpenSLES.so.lsdump
+++ b/29/64/arm64_armv8-a/source-based/libOpenSLES.so.lsdump
@@ -16257,7 +16257,7 @@
    "referenced_type" : "type-2190",
    "self_type" : "type-2189",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -16266,7 +16266,7 @@
    "referenced_type" : "type-257",
    "self_type" : "type-256",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -16572,7 +16572,7 @@
    "referenced_type" : "type-2188",
    "self_type" : "type-2187",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -16581,7 +16581,7 @@
    "referenced_type" : "type-254",
    "self_type" : "type-253",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -17787,7 +17787,7 @@
    "referenced_type" : "type-251",
    "self_type" : "type-252",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -54075,7 +54075,7 @@
    "referenced_type" : "type-250",
    "self_type" : "type-250",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -54094,7 +54094,7 @@
    "referenced_type" : "type-251",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-250" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -60774,7 +60774,7 @@
    "referenced_type" : "type-251",
    "self_type" : "type-255",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
diff --git a/29/64/arm64_armv8-a/source-based/libmediandk.so.lsdump b/29/64/arm64_armv8-a/source-based/libmediandk.so.lsdump
index a93e744..951ae75 100644
--- a/29/64/arm64_armv8-a/source-based/libmediandk.so.lsdump
+++ b/29/64/arm64_armv8-a/source-based/libmediandk.so.lsdump
@@ -14393,7 +14393,7 @@
    "referenced_type" : "type-1044",
    "self_type" : "type-1043",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14402,7 +14402,7 @@
    "referenced_type" : "type-1376",
    "self_type" : "type-1375",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14411,7 +14411,7 @@
    "referenced_type" : "type-1472",
    "self_type" : "type-1471",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14420,7 +14420,7 @@
    "referenced_type" : "type-1654",
    "self_type" : "type-1653",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14429,7 +14429,7 @@
    "referenced_type" : "type-1778",
    "self_type" : "type-1777",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14438,7 +14438,7 @@
    "referenced_type" : "type-2143",
    "self_type" : "type-2142",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14447,7 +14447,7 @@
    "referenced_type" : "type-2530",
    "self_type" : "type-2529",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14456,7 +14456,7 @@
    "referenced_type" : "type-2757",
    "self_type" : "type-2756",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14465,7 +14465,7 @@
    "referenced_type" : "type-391",
    "self_type" : "type-390",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14474,7 +14474,7 @@
    "referenced_type" : "type-778",
    "self_type" : "type-777",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14528,7 +14528,7 @@
    "referenced_type" : "type-1042",
    "self_type" : "type-1041",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14537,7 +14537,7 @@
    "referenced_type" : "type-1374",
    "self_type" : "type-1373",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14546,7 +14546,7 @@
    "referenced_type" : "type-1470",
    "self_type" : "type-1469",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14555,7 +14555,7 @@
    "referenced_type" : "type-1652",
    "self_type" : "type-1651",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14564,7 +14564,7 @@
    "referenced_type" : "type-1774",
    "self_type" : "type-1773",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14573,7 +14573,7 @@
    "referenced_type" : "type-2141",
    "self_type" : "type-2140",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14582,7 +14582,7 @@
    "referenced_type" : "type-2528",
    "self_type" : "type-2527",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14591,7 +14591,7 @@
    "referenced_type" : "type-2754",
    "self_type" : "type-2753",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14600,7 +14600,7 @@
    "referenced_type" : "type-389",
    "self_type" : "type-388",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14609,7 +14609,7 @@
    "referenced_type" : "type-776",
    "self_type" : "type-775",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -17174,7 +17174,7 @@
    "referenced_type" : "type-362",
    "self_type" : "type-2749",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -19208,7 +19208,7 @@
    "referenced_type" : "type-2751",
    "self_type" : "type-2752",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -22439,7 +22439,7 @@
    "referenced_type" : "type-362",
    "self_type" : "type-2751",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -40974,7 +40974,7 @@
    "referenced_type" : "type-363",
    "self_type" : "type-363",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -40993,7 +40993,7 @@
    "referenced_type" : "type-362",
    "self_type" : "type-362",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-363" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -49666,7 +49666,7 @@
    "referenced_type" : "type-362",
    "self_type" : "type-2755",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
diff --git a/29/64/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
index f0a641d..21e347e 100644
--- a/29/64/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
+++ b/29/64/arm_armv7-a-neon/source-based/libOpenMAXAL.so.lsdump
@@ -16310,7 +16310,7 @@
    "referenced_type" : "type-2188",
    "self_type" : "type-2187",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16319,7 +16319,7 @@
    "referenced_type" : "type-2414",
    "self_type" : "type-2413",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16328,7 +16328,7 @@
    "referenced_type" : "type-255",
    "self_type" : "type-254",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16337,7 +16337,7 @@
    "referenced_type" : "type-2614",
    "self_type" : "type-2613",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16643,7 +16643,7 @@
    "referenced_type" : "type-2186",
    "self_type" : "type-2185",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16652,7 +16652,7 @@
    "referenced_type" : "type-2412",
    "self_type" : "type-2411",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16661,7 +16661,7 @@
    "referenced_type" : "type-252",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16670,7 +16670,7 @@
    "referenced_type" : "type-2612",
    "self_type" : "type-2611",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -18236,7 +18236,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-250",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -54857,7 +54857,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-248",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -54876,7 +54876,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-249",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -61556,7 +61556,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-253",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/64/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
index c3d2ba9..6f91b3b 100644
--- a/29/64/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
+++ b/29/64/arm_armv7-a-neon/source-based/libOpenSLES.so.lsdump
@@ -16418,7 +16418,7 @@
    "referenced_type" : "type-2188",
    "self_type" : "type-2187",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16427,7 +16427,7 @@
    "referenced_type" : "type-2414",
    "self_type" : "type-2413",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16436,7 +16436,7 @@
    "referenced_type" : "type-255",
    "self_type" : "type-254",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16445,7 +16445,7 @@
    "referenced_type" : "type-2614",
    "self_type" : "type-2613",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16751,7 +16751,7 @@
    "referenced_type" : "type-2186",
    "self_type" : "type-2185",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16760,7 +16760,7 @@
    "referenced_type" : "type-2412",
    "self_type" : "type-2411",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16769,7 +16769,7 @@
    "referenced_type" : "type-252",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16778,7 +16778,7 @@
    "referenced_type" : "type-2612",
    "self_type" : "type-2611",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -18344,7 +18344,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-250",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -54965,7 +54965,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-248",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -54984,7 +54984,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-249",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -61664,7 +61664,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-253",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/64/arm_armv7-a-neon/source-based/libmediandk.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
index 138814b..0e2c927 100644
--- a/29/64/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
+++ b/29/64/arm_armv7-a-neon/source-based/libmediandk.so.lsdump
@@ -14969,7 +14969,7 @@
    "referenced_type" : "type-1036",
    "self_type" : "type-1035",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14978,7 +14978,7 @@
    "referenced_type" : "type-1469",
    "self_type" : "type-1468",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14987,7 +14987,7 @@
    "referenced_type" : "type-1845",
    "self_type" : "type-1844",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14996,7 +14996,7 @@
    "referenced_type" : "type-2272",
    "self_type" : "type-2271",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15005,7 +15005,7 @@
    "referenced_type" : "type-2749",
    "self_type" : "type-2748",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15014,7 +15014,7 @@
    "referenced_type" : "type-2976",
    "self_type" : "type-2975",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15023,7 +15023,7 @@
    "referenced_type" : "type-3130",
    "self_type" : "type-3129",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15032,7 +15032,7 @@
    "referenced_type" : "type-3383",
    "self_type" : "type-3382",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15041,7 +15041,7 @@
    "referenced_type" : "type-3472",
    "self_type" : "type-3471",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15050,7 +15050,7 @@
    "referenced_type" : "type-3635",
    "self_type" : "type-3634",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15059,7 +15059,7 @@
    "referenced_type" : "type-3749",
    "self_type" : "type-3748",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15068,7 +15068,7 @@
    "referenced_type" : "type-384",
    "self_type" : "type-383",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15077,7 +15077,7 @@
    "referenced_type" : "type-3989",
    "self_type" : "type-3988",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15086,7 +15086,7 @@
    "referenced_type" : "type-4304",
    "self_type" : "type-4303",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15095,7 +15095,7 @@
    "referenced_type" : "type-4457",
    "self_type" : "type-4456",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15104,7 +15104,7 @@
    "referenced_type" : "type-798",
    "self_type" : "type-797",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15176,7 +15176,7 @@
    "referenced_type" : "type-1034",
    "self_type" : "type-1033",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15185,7 +15185,7 @@
    "referenced_type" : "type-1467",
    "self_type" : "type-1466",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15194,7 +15194,7 @@
    "referenced_type" : "type-1843",
    "self_type" : "type-1842",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15203,7 +15203,7 @@
    "referenced_type" : "type-2266",
    "self_type" : "type-2265",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15212,7 +15212,7 @@
    "referenced_type" : "type-2747",
    "self_type" : "type-2746",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15221,7 +15221,7 @@
    "referenced_type" : "type-2974",
    "self_type" : "type-2973",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15230,7 +15230,7 @@
    "referenced_type" : "type-3128",
    "self_type" : "type-3127",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15239,7 +15239,7 @@
    "referenced_type" : "type-3381",
    "self_type" : "type-3380",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15248,7 +15248,7 @@
    "referenced_type" : "type-3470",
    "self_type" : "type-3469",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15257,7 +15257,7 @@
    "referenced_type" : "type-3633",
    "self_type" : "type-3632",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15266,7 +15266,7 @@
    "referenced_type" : "type-3747",
    "self_type" : "type-3746",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15275,7 +15275,7 @@
    "referenced_type" : "type-382",
    "self_type" : "type-381",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15284,7 +15284,7 @@
    "referenced_type" : "type-3987",
    "self_type" : "type-3986",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15293,7 +15293,7 @@
    "referenced_type" : "type-4302",
    "self_type" : "type-4301",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15302,7 +15302,7 @@
    "referenced_type" : "type-4454",
    "self_type" : "type-4453",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15311,7 +15311,7 @@
    "referenced_type" : "type-796",
    "self_type" : "type-795",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -18812,7 +18812,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2262",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -21134,7 +21134,7 @@
    "referenced_type" : "type-2263",
    "self_type" : "type-2264",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -24802,7 +24802,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2263",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -44495,7 +44495,7 @@
    "referenced_type" : "type-359",
    "self_type" : "type-359",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -44514,7 +44514,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-358",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -53187,7 +53187,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2270",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/64/arm_armv8-a/source-based/libOpenMAXAL.so.lsdump b/29/64/arm_armv8-a/source-based/libOpenMAXAL.so.lsdump
index dee28d0..fd47816 100644
--- a/29/64/arm_armv8-a/source-based/libOpenMAXAL.so.lsdump
+++ b/29/64/arm_armv8-a/source-based/libOpenMAXAL.so.lsdump
@@ -16310,7 +16310,7 @@
    "referenced_type" : "type-2188",
    "self_type" : "type-2187",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16319,7 +16319,7 @@
    "referenced_type" : "type-2414",
    "self_type" : "type-2413",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16328,7 +16328,7 @@
    "referenced_type" : "type-255",
    "self_type" : "type-254",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16337,7 +16337,7 @@
    "referenced_type" : "type-2614",
    "self_type" : "type-2613",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16643,7 +16643,7 @@
    "referenced_type" : "type-2186",
    "self_type" : "type-2185",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16652,7 +16652,7 @@
    "referenced_type" : "type-2412",
    "self_type" : "type-2411",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16661,7 +16661,7 @@
    "referenced_type" : "type-252",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16670,7 +16670,7 @@
    "referenced_type" : "type-2612",
    "self_type" : "type-2611",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -18236,7 +18236,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-250",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -54857,7 +54857,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-248",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -54876,7 +54876,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-249",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -61556,7 +61556,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-253",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/64/arm_armv8-a/source-based/libOpenSLES.so.lsdump b/29/64/arm_armv8-a/source-based/libOpenSLES.so.lsdump
index 7b6d6b5..72f75ca 100644
--- a/29/64/arm_armv8-a/source-based/libOpenSLES.so.lsdump
+++ b/29/64/arm_armv8-a/source-based/libOpenSLES.so.lsdump
@@ -16418,7 +16418,7 @@
    "referenced_type" : "type-2188",
    "self_type" : "type-2187",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16427,7 +16427,7 @@
    "referenced_type" : "type-2414",
    "self_type" : "type-2413",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16436,7 +16436,7 @@
    "referenced_type" : "type-255",
    "self_type" : "type-254",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16445,7 +16445,7 @@
    "referenced_type" : "type-2614",
    "self_type" : "type-2613",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16751,7 +16751,7 @@
    "referenced_type" : "type-2186",
    "self_type" : "type-2185",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16760,7 +16760,7 @@
    "referenced_type" : "type-2412",
    "self_type" : "type-2411",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16769,7 +16769,7 @@
    "referenced_type" : "type-252",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16778,7 +16778,7 @@
    "referenced_type" : "type-2612",
    "self_type" : "type-2611",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -18344,7 +18344,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-250",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -54965,7 +54965,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-248",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -54984,7 +54984,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-249",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -61664,7 +61664,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-253",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/64/arm_armv8-a/source-based/libmediandk.so.lsdump b/29/64/arm_armv8-a/source-based/libmediandk.so.lsdump
index 138814b..0e2c927 100644
--- a/29/64/arm_armv8-a/source-based/libmediandk.so.lsdump
+++ b/29/64/arm_armv8-a/source-based/libmediandk.so.lsdump
@@ -14969,7 +14969,7 @@
    "referenced_type" : "type-1036",
    "self_type" : "type-1035",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14978,7 +14978,7 @@
    "referenced_type" : "type-1469",
    "self_type" : "type-1468",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14987,7 +14987,7 @@
    "referenced_type" : "type-1845",
    "self_type" : "type-1844",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14996,7 +14996,7 @@
    "referenced_type" : "type-2272",
    "self_type" : "type-2271",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15005,7 +15005,7 @@
    "referenced_type" : "type-2749",
    "self_type" : "type-2748",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15014,7 +15014,7 @@
    "referenced_type" : "type-2976",
    "self_type" : "type-2975",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15023,7 +15023,7 @@
    "referenced_type" : "type-3130",
    "self_type" : "type-3129",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15032,7 +15032,7 @@
    "referenced_type" : "type-3383",
    "self_type" : "type-3382",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15041,7 +15041,7 @@
    "referenced_type" : "type-3472",
    "self_type" : "type-3471",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15050,7 +15050,7 @@
    "referenced_type" : "type-3635",
    "self_type" : "type-3634",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15059,7 +15059,7 @@
    "referenced_type" : "type-3749",
    "self_type" : "type-3748",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15068,7 +15068,7 @@
    "referenced_type" : "type-384",
    "self_type" : "type-383",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15077,7 +15077,7 @@
    "referenced_type" : "type-3989",
    "self_type" : "type-3988",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15086,7 +15086,7 @@
    "referenced_type" : "type-4304",
    "self_type" : "type-4303",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15095,7 +15095,7 @@
    "referenced_type" : "type-4457",
    "self_type" : "type-4456",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15104,7 +15104,7 @@
    "referenced_type" : "type-798",
    "self_type" : "type-797",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15176,7 +15176,7 @@
    "referenced_type" : "type-1034",
    "self_type" : "type-1033",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15185,7 +15185,7 @@
    "referenced_type" : "type-1467",
    "self_type" : "type-1466",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15194,7 +15194,7 @@
    "referenced_type" : "type-1843",
    "self_type" : "type-1842",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15203,7 +15203,7 @@
    "referenced_type" : "type-2266",
    "self_type" : "type-2265",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15212,7 +15212,7 @@
    "referenced_type" : "type-2747",
    "self_type" : "type-2746",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15221,7 +15221,7 @@
    "referenced_type" : "type-2974",
    "self_type" : "type-2973",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15230,7 +15230,7 @@
    "referenced_type" : "type-3128",
    "self_type" : "type-3127",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15239,7 +15239,7 @@
    "referenced_type" : "type-3381",
    "self_type" : "type-3380",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15248,7 +15248,7 @@
    "referenced_type" : "type-3470",
    "self_type" : "type-3469",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15257,7 +15257,7 @@
    "referenced_type" : "type-3633",
    "self_type" : "type-3632",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15266,7 +15266,7 @@
    "referenced_type" : "type-3747",
    "self_type" : "type-3746",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15275,7 +15275,7 @@
    "referenced_type" : "type-382",
    "self_type" : "type-381",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15284,7 +15284,7 @@
    "referenced_type" : "type-3987",
    "self_type" : "type-3986",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15293,7 +15293,7 @@
    "referenced_type" : "type-4302",
    "self_type" : "type-4301",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15302,7 +15302,7 @@
    "referenced_type" : "type-4454",
    "self_type" : "type-4453",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -15311,7 +15311,7 @@
    "referenced_type" : "type-796",
    "self_type" : "type-795",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -18812,7 +18812,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2262",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -21134,7 +21134,7 @@
    "referenced_type" : "type-2263",
    "self_type" : "type-2264",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -24802,7 +24802,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2263",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -44495,7 +44495,7 @@
    "referenced_type" : "type-359",
    "self_type" : "type-359",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -44514,7 +44514,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-358",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -53187,7 +53187,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2270",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/64/x86/source-based/libOpenMAXAL.so.lsdump b/29/64/x86/source-based/libOpenMAXAL.so.lsdump
index 0dd04e4..4ab6ac6 100644
--- a/29/64/x86/source-based/libOpenMAXAL.so.lsdump
+++ b/29/64/x86/source-based/libOpenMAXAL.so.lsdump
@@ -16148,7 +16148,7 @@
    "referenced_type" : "type-2188",
    "self_type" : "type-2187",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16157,7 +16157,7 @@
    "referenced_type" : "type-255",
    "self_type" : "type-254",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16463,7 +16463,7 @@
    "referenced_type" : "type-2186",
    "self_type" : "type-2185",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16472,7 +16472,7 @@
    "referenced_type" : "type-252",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -17678,7 +17678,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-250",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -53947,7 +53947,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-248",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -53966,7 +53966,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-249",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -60646,7 +60646,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-253",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/64/x86/source-based/libOpenSLES.so.lsdump b/29/64/x86/source-based/libOpenSLES.so.lsdump
index b755e17..3229d0e 100644
--- a/29/64/x86/source-based/libOpenSLES.so.lsdump
+++ b/29/64/x86/source-based/libOpenSLES.so.lsdump
@@ -16256,7 +16256,7 @@
    "referenced_type" : "type-2188",
    "self_type" : "type-2187",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16265,7 +16265,7 @@
    "referenced_type" : "type-255",
    "self_type" : "type-254",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16571,7 +16571,7 @@
    "referenced_type" : "type-2186",
    "self_type" : "type-2185",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16580,7 +16580,7 @@
    "referenced_type" : "type-252",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -17786,7 +17786,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-250",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -54055,7 +54055,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-248",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -54074,7 +54074,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-249",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -60754,7 +60754,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-253",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/64/x86/source-based/libmediandk.so.lsdump b/29/64/x86/source-based/libmediandk.so.lsdump
index 6553a35..29188e2 100644
--- a/29/64/x86/source-based/libmediandk.so.lsdump
+++ b/29/64/x86/source-based/libmediandk.so.lsdump
@@ -14374,7 +14374,7 @@
    "referenced_type" : "type-1036",
    "self_type" : "type-1035",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14383,7 +14383,7 @@
    "referenced_type" : "type-1367",
    "self_type" : "type-1366",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14392,7 +14392,7 @@
    "referenced_type" : "type-1463",
    "self_type" : "type-1462",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14401,7 +14401,7 @@
    "referenced_type" : "type-1645",
    "self_type" : "type-1644",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14410,7 +14410,7 @@
    "referenced_type" : "type-1767",
    "self_type" : "type-1766",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14419,7 +14419,7 @@
    "referenced_type" : "type-2131",
    "self_type" : "type-2130",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14428,7 +14428,7 @@
    "referenced_type" : "type-2516",
    "self_type" : "type-2515",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14437,7 +14437,7 @@
    "referenced_type" : "type-2746",
    "self_type" : "type-2745",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14446,7 +14446,7 @@
    "referenced_type" : "type-384",
    "self_type" : "type-383",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14455,7 +14455,7 @@
    "referenced_type" : "type-798",
    "self_type" : "type-797",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14509,7 +14509,7 @@
    "referenced_type" : "type-1034",
    "self_type" : "type-1033",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14518,7 +14518,7 @@
    "referenced_type" : "type-1365",
    "self_type" : "type-1364",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14527,7 +14527,7 @@
    "referenced_type" : "type-1461",
    "self_type" : "type-1460",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14536,7 +14536,7 @@
    "referenced_type" : "type-1640",
    "self_type" : "type-1639",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14545,7 +14545,7 @@
    "referenced_type" : "type-1765",
    "self_type" : "type-1764",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14554,7 +14554,7 @@
    "referenced_type" : "type-2129",
    "self_type" : "type-2128",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14563,7 +14563,7 @@
    "referenced_type" : "type-2514",
    "self_type" : "type-2513",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14572,7 +14572,7 @@
    "referenced_type" : "type-2740",
    "self_type" : "type-2739",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14581,7 +14581,7 @@
    "referenced_type" : "type-382",
    "self_type" : "type-381",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14590,7 +14590,7 @@
    "referenced_type" : "type-796",
    "self_type" : "type-795",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -17155,7 +17155,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2736",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -19189,7 +19189,7 @@
    "referenced_type" : "type-2737",
    "self_type" : "type-2738",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -22402,7 +22402,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2737",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -40927,7 +40927,7 @@
    "referenced_type" : "type-359",
    "self_type" : "type-359",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -40946,7 +40946,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-358",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -49619,7 +49619,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2744",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/64/x86_64/source-based/libOpenMAXAL.so.lsdump b/29/64/x86_64/source-based/libOpenMAXAL.so.lsdump
index 5d6d504..7d430f8 100644
--- a/29/64/x86_64/source-based/libOpenMAXAL.so.lsdump
+++ b/29/64/x86_64/source-based/libOpenMAXAL.so.lsdump
@@ -16148,7 +16148,7 @@
    "referenced_type" : "type-2190",
    "self_type" : "type-2189",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -16157,7 +16157,7 @@
    "referenced_type" : "type-257",
    "self_type" : "type-256",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -16463,7 +16463,7 @@
    "referenced_type" : "type-2188",
    "self_type" : "type-2187",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -16472,7 +16472,7 @@
    "referenced_type" : "type-254",
    "self_type" : "type-253",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -17678,7 +17678,7 @@
    "referenced_type" : "type-251",
    "self_type" : "type-252",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -53966,7 +53966,7 @@
    "referenced_type" : "type-250",
    "self_type" : "type-250",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -53985,7 +53985,7 @@
    "referenced_type" : "type-251",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-250" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -60665,7 +60665,7 @@
    "referenced_type" : "type-251",
    "self_type" : "type-255",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
diff --git a/29/64/x86_64/source-based/libOpenSLES.so.lsdump b/29/64/x86_64/source-based/libOpenSLES.so.lsdump
index 5782e09..a9d4af4 100644
--- a/29/64/x86_64/source-based/libOpenSLES.so.lsdump
+++ b/29/64/x86_64/source-based/libOpenSLES.so.lsdump
@@ -16256,7 +16256,7 @@
    "referenced_type" : "type-2190",
    "self_type" : "type-2189",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -16265,7 +16265,7 @@
    "referenced_type" : "type-257",
    "self_type" : "type-256",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -16571,7 +16571,7 @@
    "referenced_type" : "type-2188",
    "self_type" : "type-2187",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -16580,7 +16580,7 @@
    "referenced_type" : "type-254",
    "self_type" : "type-253",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -17786,7 +17786,7 @@
    "referenced_type" : "type-251",
    "self_type" : "type-252",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -54074,7 +54074,7 @@
    "referenced_type" : "type-250",
    "self_type" : "type-250",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -54093,7 +54093,7 @@
    "referenced_type" : "type-251",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-250" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -60773,7 +60773,7 @@
    "referenced_type" : "type-251",
    "self_type" : "type-255",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
diff --git a/29/64/x86_64/source-based/libmediandk.so.lsdump b/29/64/x86_64/source-based/libmediandk.so.lsdump
index 3de7cb1..bdfc095 100644
--- a/29/64/x86_64/source-based/libmediandk.so.lsdump
+++ b/29/64/x86_64/source-based/libmediandk.so.lsdump
@@ -14389,7 +14389,7 @@
    "referenced_type" : "type-1044",
    "self_type" : "type-1043",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14398,7 +14398,7 @@
    "referenced_type" : "type-1376",
    "self_type" : "type-1375",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14407,7 +14407,7 @@
    "referenced_type" : "type-1472",
    "self_type" : "type-1471",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14416,7 +14416,7 @@
    "referenced_type" : "type-1654",
    "self_type" : "type-1653",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14425,7 +14425,7 @@
    "referenced_type" : "type-1778",
    "self_type" : "type-1777",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14434,7 +14434,7 @@
    "referenced_type" : "type-2143",
    "self_type" : "type-2142",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14443,7 +14443,7 @@
    "referenced_type" : "type-2530",
    "self_type" : "type-2529",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14452,7 +14452,7 @@
    "referenced_type" : "type-2757",
    "self_type" : "type-2756",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14461,7 +14461,7 @@
    "referenced_type" : "type-391",
    "self_type" : "type-390",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14470,7 +14470,7 @@
    "referenced_type" : "type-778",
    "self_type" : "type-777",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14524,7 +14524,7 @@
    "referenced_type" : "type-1042",
    "self_type" : "type-1041",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14533,7 +14533,7 @@
    "referenced_type" : "type-1374",
    "self_type" : "type-1373",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14542,7 +14542,7 @@
    "referenced_type" : "type-1470",
    "self_type" : "type-1469",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14551,7 +14551,7 @@
    "referenced_type" : "type-1652",
    "self_type" : "type-1651",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14560,7 +14560,7 @@
    "referenced_type" : "type-1774",
    "self_type" : "type-1773",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14569,7 +14569,7 @@
    "referenced_type" : "type-2141",
    "self_type" : "type-2140",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14578,7 +14578,7 @@
    "referenced_type" : "type-2528",
    "self_type" : "type-2527",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14587,7 +14587,7 @@
    "referenced_type" : "type-2754",
    "self_type" : "type-2753",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14596,7 +14596,7 @@
    "referenced_type" : "type-389",
    "self_type" : "type-388",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -14605,7 +14605,7 @@
    "referenced_type" : "type-776",
    "self_type" : "type-775",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -17170,7 +17170,7 @@
    "referenced_type" : "type-362",
    "self_type" : "type-2749",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -19204,7 +19204,7 @@
    "referenced_type" : "type-2751",
    "self_type" : "type-2752",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -22435,7 +22435,7 @@
    "referenced_type" : "type-362",
    "self_type" : "type-2751",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
@@ -40970,7 +40970,7 @@
    "referenced_type" : "type-363",
    "self_type" : "type-363",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -40989,7 +40989,7 @@
    "referenced_type" : "type-362",
    "self_type" : "type-362",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-363" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -49662,7 +49662,7 @@
    "referenced_type" : "type-362",
    "self_type" : "type-2755",
    "size" : 8,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
diff --git a/29/64/x86_x86_64/source-based/libOpenMAXAL.so.lsdump b/29/64/x86_x86_64/source-based/libOpenMAXAL.so.lsdump
index 708d8b2..35125aa 100644
--- a/29/64/x86_x86_64/source-based/libOpenMAXAL.so.lsdump
+++ b/29/64/x86_x86_64/source-based/libOpenMAXAL.so.lsdump
@@ -16148,7 +16148,7 @@
    "referenced_type" : "type-2188",
    "self_type" : "type-2187",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16157,7 +16157,7 @@
    "referenced_type" : "type-255",
    "self_type" : "type-254",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16463,7 +16463,7 @@
    "referenced_type" : "type-2186",
    "self_type" : "type-2185",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16472,7 +16472,7 @@
    "referenced_type" : "type-252",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -17678,7 +17678,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-250",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -53947,7 +53947,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-248",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -53966,7 +53966,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-249",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -60646,7 +60646,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-253",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/64/x86_x86_64/source-based/libOpenSLES.so.lsdump b/29/64/x86_x86_64/source-based/libOpenSLES.so.lsdump
index fc7e1ec..f6fbec8 100644
--- a/29/64/x86_x86_64/source-based/libOpenSLES.so.lsdump
+++ b/29/64/x86_x86_64/source-based/libOpenSLES.so.lsdump
@@ -16256,7 +16256,7 @@
    "referenced_type" : "type-2188",
    "self_type" : "type-2187",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16265,7 +16265,7 @@
    "referenced_type" : "type-255",
    "self_type" : "type-254",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16571,7 +16571,7 @@
    "referenced_type" : "type-2186",
    "self_type" : "type-2185",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -16580,7 +16580,7 @@
    "referenced_type" : "type-252",
    "self_type" : "type-251",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -17786,7 +17786,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-250",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -54055,7 +54055,7 @@
    "referenced_type" : "type-248",
    "self_type" : "type-248",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -54074,7 +54074,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-249",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -60754,7 +60754,7 @@
    "referenced_type" : "type-249",
    "self_type" : "type-253",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
diff --git a/29/64/x86_x86_64/source-based/libmediandk.so.lsdump b/29/64/x86_x86_64/source-based/libmediandk.so.lsdump
index 6553a35..29188e2 100644
--- a/29/64/x86_x86_64/source-based/libmediandk.so.lsdump
+++ b/29/64/x86_x86_64/source-based/libmediandk.so.lsdump
@@ -14374,7 +14374,7 @@
    "referenced_type" : "type-1036",
    "self_type" : "type-1035",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14383,7 +14383,7 @@
    "referenced_type" : "type-1367",
    "self_type" : "type-1366",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14392,7 +14392,7 @@
    "referenced_type" : "type-1463",
    "self_type" : "type-1462",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14401,7 +14401,7 @@
    "referenced_type" : "type-1645",
    "self_type" : "type-1644",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14410,7 +14410,7 @@
    "referenced_type" : "type-1767",
    "self_type" : "type-1766",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14419,7 +14419,7 @@
    "referenced_type" : "type-2131",
    "self_type" : "type-2130",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14428,7 +14428,7 @@
    "referenced_type" : "type-2516",
    "self_type" : "type-2515",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14437,7 +14437,7 @@
    "referenced_type" : "type-2746",
    "self_type" : "type-2745",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14446,7 +14446,7 @@
    "referenced_type" : "type-384",
    "self_type" : "type-383",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14455,7 +14455,7 @@
    "referenced_type" : "type-798",
    "self_type" : "type-797",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14509,7 +14509,7 @@
    "referenced_type" : "type-1034",
    "self_type" : "type-1033",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14518,7 +14518,7 @@
    "referenced_type" : "type-1365",
    "self_type" : "type-1364",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14527,7 +14527,7 @@
    "referenced_type" : "type-1461",
    "self_type" : "type-1460",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14536,7 +14536,7 @@
    "referenced_type" : "type-1640",
    "self_type" : "type-1639",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14545,7 +14545,7 @@
    "referenced_type" : "type-1765",
    "self_type" : "type-1764",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14554,7 +14554,7 @@
    "referenced_type" : "type-2129",
    "self_type" : "type-2128",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14563,7 +14563,7 @@
    "referenced_type" : "type-2514",
    "self_type" : "type-2513",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14572,7 +14572,7 @@
    "referenced_type" : "type-2740",
    "self_type" : "type-2739",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14581,7 +14581,7 @@
    "referenced_type" : "type-382",
    "self_type" : "type-381",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -14590,7 +14590,7 @@
    "referenced_type" : "type-796",
    "self_type" : "type-795",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -17155,7 +17155,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2736",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -19189,7 +19189,7 @@
    "referenced_type" : "type-2737",
    "self_type" : "type-2738",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -22402,7 +22402,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2737",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
@@ -40927,7 +40927,7 @@
    "referenced_type" : "type-359",
    "self_type" : "type-359",
    "size" : 1,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
@@ -40946,7 +40946,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-358",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h",
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
@@ -49619,7 +49619,7 @@
    "referenced_type" : "type-358",
    "self_type" : "type-2744",
    "size" : 4,
-   "source_file" : "/system/libbase/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,