Merge "Update kernel-build-tools to ab/12535410" into main
diff --git a/BUILD.bazel b/BUILD.bazel
index 6aaccf2..61e871c 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -167,7 +167,7 @@
 
 prebuilt_tool(
     name = "avbtool",
-    visibility = ["//build/kernel:__subpackages__"],
+    visibility = ["//visibility:public"],
 )
 
 prebuilt_tool(
diff --git a/build-prebuilts.sh b/build-prebuilts.sh
index 6ee3ab1..e65c931 100755
--- a/build-prebuilts.sh
+++ b/build-prebuilts.sh
@@ -74,6 +74,7 @@
 
     SOONG_LIBRARIES=(
         libcrypto-host.so
+        libdw.so
         libelf.so
         libinterceptor.so
     )
@@ -114,6 +115,10 @@
     cp -a ${TOP}/external/elfutils/libelf/nlist.h ${include_dir}/
     cp -a ${TOP}/external/elfutils/libelf/elf-knowledge.h ${include_dir}/elfutils/
     cp -a ${TOP}/external/elfutils/version.h ${include_dir}/elfutils/
+    # libdw
+    cp -a ${TOP}/external/elfutils/libdw/dwarf.h ${include_dir}/
+    cp -a ${TOP}/external/elfutils/libdw/libdw.h ${include_dir}/elfutils/
+    cp -a ${TOP}/external/elfutils/libdwfl/libdwfl.h ${include_dir}/elfutils/
 
     # Stage share files
     share_dir=${SOONG_OUT}/dist/share