Snap for 12658558 from d2569f54bb570091e5cc01aa839fd3de9f6b5d3b to 25Q1-release

Change-Id: Ic22232c40bc035a5880c7b438d4904c3b19e7c90
diff --git a/liburing_cpp/Android.bp b/liburing_cpp/Android.bp
index 0daa48d..e17f080 100644
--- a/liburing_cpp/Android.bp
+++ b/liburing_cpp/Android.bp
@@ -19,7 +19,6 @@
 	static_libs: [
 		"liburing",
 	],
-	include_dirs: ["bionic/libc/kernel"],
 	export_include_dirs: [
 		"include",
 	],
diff --git a/liburing_cpp/src/IoUring.cpp b/liburing_cpp/src/IoUring.cpp
index f561d25..cf10272 100644
--- a/liburing_cpp/src/IoUring.cpp
+++ b/liburing_cpp/src/IoUring.cpp
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-#include <asm-generic/errno-base.h>
+#include <errno.h>
 #include <liburing_cpp/IoUring.h>
 #include <string.h>
 
diff --git a/payload_consumer/xor_extent_writer.h b/payload_consumer/xor_extent_writer.h
index ea270bc..d965aba 100644
--- a/payload_consumer/xor_extent_writer.h
+++ b/payload_consumer/xor_extent_writer.h
@@ -36,7 +36,7 @@
                   FileDescriptorPtr source_fd,
                   android::snapshot::ICowWriter* cow_writer,
                   const ExtentMap<const CowMergeOperation*>& xor_map,
-                  size_t partition_size)
+                  uint64_t partition_size)
       : src_extents_(op.src_extents()),
         source_fd_(source_fd),
         xor_map_(xor_map),