Mark ab/6881855 as merged
Bug: 172690556
Change-Id: Ia33696b31031f770f9cd96c88fe69c0222060cb5
diff --git a/arm/configs/module_paths.txt b/arm/configs/module_paths.txt
index 9353388..2ec6793 100644
--- a/arm/configs/module_paths.txt
+++ b/arm/configs/module_paths.txt
@@ -208,8 +208,8 @@
libRSCpuRef.so frameworks/rs/cpu_ref
libRSDriver.so frameworks/rs
libRS_internal.so frameworks/rs
-libbacktrace.so system/core/libbacktrace system/core/libbacktrace
-libbase.so system/core/base system/core/base
+libbacktrace.so system/unwinding/libbacktrace system/unwinding/libbacktrace
+libbase.so system/libbase system/libbase
libbcinfo.so frameworks/compile/libbcc/bcinfo
libblas.so external/cblas
libc++.so external/libcxx
@@ -224,7 +224,7 @@
libion.so system/core/libion system/core/libion
liblzma.so external/lzma/C external/lzma/C
libunwind.so external/libunwind external/libunwind
-libunwindstack.so system/core/libunwindstack system/core/libunwindstack
+libunwindstack.so system/unwinding/libunwindstack system/unwinding/libunwindstack
libutils.so system/core/libutils system/core/libutils
libutilscallstack.so system/core/libutils system/core/libutils
libz.so external/zlib external/zlib
diff --git a/arm64/configs/module_paths.txt b/arm64/configs/module_paths.txt
index 858063f..d50a3ea 100644
--- a/arm64/configs/module_paths.txt
+++ b/arm64/configs/module_paths.txt
@@ -209,8 +209,8 @@
libRSCpuRef.so frameworks/rs/cpu_ref
libRSDriver.so frameworks/rs
libRS_internal.so frameworks/rs
-libbacktrace.so system/core/libbacktrace system/core/libbacktrace
-libbase.so system/core/base system/core/base
+libbacktrace.so system/unwinding/libbacktrace system/unwinding/libbacktrace
+libbase.so system/libbase system/libbase
libbcinfo.so frameworks/compile/libbcc/bcinfo
libblas.so external/cblas
libc++.so external/libcxx
@@ -225,7 +225,7 @@
libion.so system/core/libion system/core/libion
liblzma.so external/lzma/C external/lzma/C
libunwind.so external/libunwind external/libunwind
-libunwindstack.so system/core/libunwindstack system/core/libunwindstack
+libunwindstack.so system/unwinding/libunwindstack system/unwinding/libunwindstack
libutils.so system/core/libutils system/core/libutils
libutilscallstack.so system/core/libutils system/core/libutils
libz.so external/zlib external/zlib
diff --git a/x86/configs/module_paths.txt b/x86/configs/module_paths.txt
index 62ac050..bec4289 100644
--- a/x86/configs/module_paths.txt
+++ b/x86/configs/module_paths.txt
@@ -208,8 +208,8 @@
libRSCpuRef.so frameworks/rs/cpu_ref
libRSDriver.so frameworks/rs
libRS_internal.so frameworks/rs
-libbacktrace.so system/core/libbacktrace system/core/libbacktrace
-libbase.so system/core/base system/core/base
+libbacktrace.so system/unwinding/libbacktrace system/unwinding/libbacktrace
+libbase.so system/libbase system/libbase
libbcinfo.so frameworks/compile/libbcc/bcinfo
libblas.so external/cblas
libc++.so external/libcxx
@@ -224,7 +224,7 @@
libion.so system/core/libion system/core/libion
liblzma.so external/lzma/C external/lzma/C
libunwind.so external/libunwind external/libunwind
-libunwindstack.so system/core/libunwindstack system/core/libunwindstack
+libunwindstack.so system/unwinding/libunwindstack system/unwinding/libunwindstack
libutils.so system/core/libutils system/core/libutils
libutilscallstack.so system/core/libutils system/core/libutils
libz.so external/zlib external/zlib
diff --git a/x86_64/configs/module_paths.txt b/x86_64/configs/module_paths.txt
index 327aec0..6ae00f0 100644
--- a/x86_64/configs/module_paths.txt
+++ b/x86_64/configs/module_paths.txt
@@ -209,8 +209,8 @@
libRSCpuRef.so frameworks/rs/cpu_ref
libRSDriver.so frameworks/rs
libRS_internal.so frameworks/rs
-libbacktrace.so system/core/libbacktrace system/core/libbacktrace
-libbase.so system/core/base system/core/base
+libbacktrace.so system/unwinding/libbacktrace system/unwinding/libbacktrace
+libbase.so system/libbase system/libbase
libbcinfo.so frameworks/compile/libbcc/bcinfo
libblas.so external/cblas
libc++.so external/libcxx
@@ -225,7 +225,7 @@
libion.so system/core/libion system/core/libion
liblzma.so external/lzma/C external/lzma/C
libunwind.so external/libunwind external/libunwind
-libunwindstack.so system/core/libunwindstack system/core/libunwindstack
+libunwindstack.so system/unwinding/libunwindstack system/unwinding/libunwindstack
libutils.so system/core/libutils system/core/libutils
libutilscallstack.so system/core/libutils system/core/libutils
libz.so external/zlib external/zlib