Revert "Merge cherrypicks of [13343779, 13343968, 13343886, 13343395, 13341216, 13343957, 13343958, 13343762, 13343763, 13343764, 13344125, 13344126, 13344127, 13344128, 13344129, 13344130, 13344131, 13343396, 13343780, 13343781, 13343782, 13343783, 13343784, 13344185, 13343959, 13343960, 13343961, 13343962, 13343963, 13343964, 13344205, 13344206, 13344207, 13344208, 13344209, 13344186, 13343969, 13343970, 13343971, 13343972, 13343973, 13343974, 13343975, 13343918, 13343919, 13343976, 13343397, 13344187] into rvc-qpr2-release"

This reverts commit 25b875195f5e5dd88a9f1d6ef1401c09680e0bea.

Reason for revert: b/177499518 - Broken build

Change-Id: I842d3bd9cd9583cbe2870597b5ac11651b4a9119
(cherry picked from commit deb059183579176ab89625390b670481360820f2)
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_Image_lz4.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_Image_lz4.asciipb
index 0b989d6..9d9f46d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_Image_lz4.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_Image_lz4.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "Image.lz4"
   }
   dest_file: "Image.lz4"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_Image_lz4.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_Image_lz4.asciipb
index 6500384..8e2c8d3 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_Image_lz4.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_Image_lz4.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "Image.lz4"
   }
   dest_file: "debug_api/Image.lz4"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_dtbo_img.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_dtbo_img.asciipb
index ad407e2..a617caf 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_dtbo_img.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_dtbo_img.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "dtbo.img"
   }
   dest_file: "debug_api/dtbo.img"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_ftm5_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_ftm5_ko.asciipb
index bcf071b..777a410 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_ftm5_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_ftm5_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "ftm5.ko"
   }
   dest_file: "debug_api/ftm5.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_heatmap_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_heatmap_ko.asciipb
index d19a2e1..310eccf 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_heatmap_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_heatmap_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "heatmap.ko"
   }
   dest_file: "debug_api/heatmap.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_pinctrl-wcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_pinctrl-wcd_ko.asciipb
index 34cd191..d867b96 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_pinctrl-wcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_pinctrl-wcd_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "pinctrl-wcd.ko"
   }
   dest_file: "debug_api/pinctrl-wcd.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm845-v2_1_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm845-v2_1_dtb.asciipb
index f0764b3..cc9808e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm845-v2_1_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm845-v2_1_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "sdm845-v2.1.dtb"
   }
   dest_file: "debug_api/sdm845-v2.1.dtb"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm845-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm845-v2_dtb.asciipb
index 7ae2020..0a1b4ec 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm845-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm845-v2_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "sdm845-v2.dtb"
   }
   dest_file: "debug_api/sdm845-v2.dtb"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sec_touch_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sec_touch_ko.asciipb
index a96e6e1..29c373e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sec_touch_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sec_touch_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "sec_touch.ko"
   }
   dest_file: "debug_api/sec_touch.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-cs35l36_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-cs35l36_ko.asciipb
index 48b376b..38eb24a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-cs35l36_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-cs35l36_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "snd-soc-cs35l36.ko"
   }
   dest_file: "debug_api/snd-soc-cs35l36.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-sdm845-max98927_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-sdm845-max98927_ko.asciipb
index c7592ae..7bb920b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-sdm845-max98927_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-sdm845-max98927_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "snd-soc-sdm845-max98927.ko"
   }
   dest_file: "debug_api/snd-soc-sdm845-max98927.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-sdm845_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-sdm845_ko.asciipb
index e40f71f..2be735f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-sdm845_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-sdm845_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "snd-soc-sdm845.ko"
   }
   dest_file: "debug_api/snd-soc-sdm845.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd-spi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd-spi_ko.asciipb
index 3fbcc29..b4bcc04 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd-spi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd-spi_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "snd-soc-wcd-spi.ko"
   }
   dest_file: "debug_api/snd-soc-wcd-spi.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd934x_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd934x_ko.asciipb
index f6323d1..093e004 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd934x_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd934x_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "snd-soc-wcd934x.ko"
   }
   dest_file: "debug_api/snd-soc-wcd934x.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd9xxx_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd9xxx_ko.asciipb
index 504e9f8..9f89ca9 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd9xxx_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd9xxx_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "snd-soc-wcd9xxx.ko"
   }
   dest_file: "debug_api/snd-soc-wcd9xxx.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_videobuf2-memops_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_videobuf2-memops_ko.asciipb
index 0e9d163..16fd6dc 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_videobuf2-memops_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_videobuf2-memops_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "debug_api/videobuf2-memops.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_videobuf2-vmalloc_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_videobuf2-vmalloc_ko.asciipb
index 040ea60..a53441f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_videobuf2-vmalloc_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_videobuf2-vmalloc_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "debug_api/videobuf2-vmalloc.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd-core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd-core_ko.asciipb
index 8cb12bb..d988dae 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd-core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd-core_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "wcd-core.ko"
   }
   dest_file: "debug_api/wcd-core.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd-dsp-glink_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd-dsp-glink_ko.asciipb
index d0958b5..5d9b0ed 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd-dsp-glink_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd-dsp-glink_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "wcd-dsp-glink.ko"
   }
   dest_file: "debug_api/wcd-dsp-glink.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wlan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wlan_ko.asciipb
index 2c4b2a7..ace82f4 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wlan_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wlan_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_api"
     source_file: "wlan.ko"
   }
   dest_file: "debug_api/wlan.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_Image_lz4.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_Image_lz4.asciipb
index 644de83..ffb6996 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_Image_lz4.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_Image_lz4.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "Image.lz4"
   }
   dest_file: "debug_hang/Image.lz4"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_dtbo_img.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_dtbo_img.asciipb
index 58ae513..f39dfa5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_dtbo_img.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_dtbo_img.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "dtbo.img"
   }
   dest_file: "debug_hang/dtbo.img"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_ftm5_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_ftm5_ko.asciipb
index eccb025..5fc7f6c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_ftm5_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_ftm5_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "ftm5.ko"
   }
   dest_file: "debug_hang/ftm5.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_heatmap_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_heatmap_ko.asciipb
index bb945fc..5244464 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_heatmap_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_heatmap_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "heatmap.ko"
   }
   dest_file: "debug_hang/heatmap.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_pinctrl-wcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_pinctrl-wcd_ko.asciipb
index 13ba0c5..636fed3 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_pinctrl-wcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_pinctrl-wcd_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "pinctrl-wcd.ko"
   }
   dest_file: "debug_hang/pinctrl-wcd.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm845-v2_1_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm845-v2_1_dtb.asciipb
index 9cbefa6..32eebad 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm845-v2_1_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm845-v2_1_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "sdm845-v2.1.dtb"
   }
   dest_file: "debug_hang/sdm845-v2.1.dtb"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm845-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm845-v2_dtb.asciipb
index 68c334d..90e65bc 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm845-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm845-v2_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "sdm845-v2.dtb"
   }
   dest_file: "debug_hang/sdm845-v2.dtb"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sec_touch_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sec_touch_ko.asciipb
index 8043a21..4065ad8 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sec_touch_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sec_touch_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "sec_touch.ko"
   }
   dest_file: "debug_hang/sec_touch.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-cs35l36_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-cs35l36_ko.asciipb
index ece9ece..d97fb72 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-cs35l36_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-cs35l36_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "snd-soc-cs35l36.ko"
   }
   dest_file: "debug_hang/snd-soc-cs35l36.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-sdm845-max98927_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-sdm845-max98927_ko.asciipb
index 9a8076c..9e20574 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-sdm845-max98927_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-sdm845-max98927_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "snd-soc-sdm845-max98927.ko"
   }
   dest_file: "debug_hang/snd-soc-sdm845-max98927.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-sdm845_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-sdm845_ko.asciipb
index 082dd8e..3702149 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-sdm845_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-sdm845_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "snd-soc-sdm845.ko"
   }
   dest_file: "debug_hang/snd-soc-sdm845.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd-spi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd-spi_ko.asciipb
index d0b2151..733a0c1 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd-spi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd-spi_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "snd-soc-wcd-spi.ko"
   }
   dest_file: "debug_hang/snd-soc-wcd-spi.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd934x_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd934x_ko.asciipb
index 38c6cf8..ad2cb58 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd934x_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd934x_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "snd-soc-wcd934x.ko"
   }
   dest_file: "debug_hang/snd-soc-wcd934x.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd9xxx_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd9xxx_ko.asciipb
index c81e30c..e50a8fe 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd9xxx_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd9xxx_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "snd-soc-wcd9xxx.ko"
   }
   dest_file: "debug_hang/snd-soc-wcd9xxx.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_videobuf2-memops_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_videobuf2-memops_ko.asciipb
index 85ee13c..c17448d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_videobuf2-memops_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_videobuf2-memops_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "debug_hang/videobuf2-memops.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_videobuf2-vmalloc_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_videobuf2-vmalloc_ko.asciipb
index 0c01a44..126e345 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_videobuf2-vmalloc_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_videobuf2-vmalloc_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "debug_hang/videobuf2-vmalloc.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd-core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd-core_ko.asciipb
index 8a63694..f7a03aa 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd-core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd-core_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "wcd-core.ko"
   }
   dest_file: "debug_hang/wcd-core.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd-dsp-glink_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd-dsp-glink_ko.asciipb
index e78004d..80820c6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd-dsp-glink_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd-dsp-glink_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "wcd-dsp-glink.ko"
   }
   dest_file: "debug_hang/wcd-dsp-glink.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wlan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wlan_ko.asciipb
index f8f8cdc..9b3b0b7 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wlan_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wlan_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_hang"
     source_file: "wlan.ko"
   }
   dest_file: "debug_hang/wlan.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_Image_lz4.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_Image_lz4.asciipb
index ad3ca0f..500e0bb 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_Image_lz4.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_Image_lz4.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "Image.lz4"
   }
   dest_file: "debug_locking/Image.lz4"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_dtbo_img.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_dtbo_img.asciipb
index d9c4bb5..122809e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_dtbo_img.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_dtbo_img.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "dtbo.img"
   }
   dest_file: "debug_locking/dtbo.img"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_ftm5_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_ftm5_ko.asciipb
index 73f174a..1102d8e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_ftm5_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_ftm5_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "ftm5.ko"
   }
   dest_file: "debug_locking/ftm5.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_heatmap_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_heatmap_ko.asciipb
index 993c0a0..f8571dd 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_heatmap_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_heatmap_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "heatmap.ko"
   }
   dest_file: "debug_locking/heatmap.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_pinctrl-wcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_pinctrl-wcd_ko.asciipb
index aebfc2d..907c5ac 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_pinctrl-wcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_pinctrl-wcd_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "pinctrl-wcd.ko"
   }
   dest_file: "debug_locking/pinctrl-wcd.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm845-v2_1_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm845-v2_1_dtb.asciipb
index de0ed02..dfd9ab9 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm845-v2_1_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm845-v2_1_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "sdm845-v2.1.dtb"
   }
   dest_file: "debug_locking/sdm845-v2.1.dtb"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm845-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm845-v2_dtb.asciipb
index c58bee4..cf8f38c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm845-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm845-v2_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "sdm845-v2.dtb"
   }
   dest_file: "debug_locking/sdm845-v2.dtb"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sec_touch_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sec_touch_ko.asciipb
index 6f4371b..dc4befb 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sec_touch_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sec_touch_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "sec_touch.ko"
   }
   dest_file: "debug_locking/sec_touch.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-cs35l36_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-cs35l36_ko.asciipb
index 69f277a..0dc332b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-cs35l36_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-cs35l36_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "snd-soc-cs35l36.ko"
   }
   dest_file: "debug_locking/snd-soc-cs35l36.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-sdm845-max98927_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-sdm845-max98927_ko.asciipb
index c62d993..8f3c106 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-sdm845-max98927_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-sdm845-max98927_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "snd-soc-sdm845-max98927.ko"
   }
   dest_file: "debug_locking/snd-soc-sdm845-max98927.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-sdm845_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-sdm845_ko.asciipb
index 79dd93a..fb41bd1 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-sdm845_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-sdm845_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "snd-soc-sdm845.ko"
   }
   dest_file: "debug_locking/snd-soc-sdm845.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd-spi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd-spi_ko.asciipb
index 55bebb9..14fa68b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd-spi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd-spi_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "snd-soc-wcd-spi.ko"
   }
   dest_file: "debug_locking/snd-soc-wcd-spi.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd934x_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd934x_ko.asciipb
index 1b86b53..13a0541 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd934x_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd934x_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "snd-soc-wcd934x.ko"
   }
   dest_file: "debug_locking/snd-soc-wcd934x.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd9xxx_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd9xxx_ko.asciipb
index 24424b2..60d4e1d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd9xxx_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd9xxx_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "snd-soc-wcd9xxx.ko"
   }
   dest_file: "debug_locking/snd-soc-wcd9xxx.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_videobuf2-memops_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_videobuf2-memops_ko.asciipb
index c75f7fa..b6986f0 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_videobuf2-memops_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_videobuf2-memops_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "debug_locking/videobuf2-memops.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_videobuf2-vmalloc_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_videobuf2-vmalloc_ko.asciipb
index a92d065..b578689 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_videobuf2-vmalloc_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_videobuf2-vmalloc_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "debug_locking/videobuf2-vmalloc.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd-core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd-core_ko.asciipb
index cc9acb9..b7581a9 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd-core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd-core_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "wcd-core.ko"
   }
   dest_file: "debug_locking/wcd-core.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd-dsp-glink_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd-dsp-glink_ko.asciipb
index 1f4e1ff..2554517 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd-dsp-glink_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd-dsp-glink_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "wcd-dsp-glink.ko"
   }
   dest_file: "debug_locking/wcd-dsp-glink.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wlan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wlan_ko.asciipb
index 2ab1770..48cbc33 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wlan_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wlan_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_locking"
     source_file: "wlan.ko"
   }
   dest_file: "debug_locking/wlan.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_Image_lz4.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_Image_lz4.asciipb
index a39da5a..be0a55d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_Image_lz4.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_Image_lz4.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "Image.lz4"
   }
   dest_file: "debug_memory/Image.lz4"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_dtbo_img.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_dtbo_img.asciipb
index 1a075b4..1ea7ef5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_dtbo_img.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_dtbo_img.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "dtbo.img"
   }
   dest_file: "debug_memory/dtbo.img"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_ftm5_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_ftm5_ko.asciipb
index 16557f2..599adda 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_ftm5_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_ftm5_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "ftm5.ko"
   }
   dest_file: "debug_memory/ftm5.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_heatmap_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_heatmap_ko.asciipb
index addcf8e..d91ff87 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_heatmap_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_heatmap_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "heatmap.ko"
   }
   dest_file: "debug_memory/heatmap.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_pinctrl-wcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_pinctrl-wcd_ko.asciipb
index d75deef..9af5cef 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_pinctrl-wcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_pinctrl-wcd_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "pinctrl-wcd.ko"
   }
   dest_file: "debug_memory/pinctrl-wcd.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm845-v2_1_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm845-v2_1_dtb.asciipb
index 409de10..f61327a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm845-v2_1_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm845-v2_1_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "sdm845-v2.1.dtb"
   }
   dest_file: "debug_memory/sdm845-v2.1.dtb"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm845-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm845-v2_dtb.asciipb
index f7788ac..7cbb00e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm845-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm845-v2_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "sdm845-v2.dtb"
   }
   dest_file: "debug_memory/sdm845-v2.dtb"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sec_touch_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sec_touch_ko.asciipb
index ec33e19..27dbb96 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sec_touch_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sec_touch_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "sec_touch.ko"
   }
   dest_file: "debug_memory/sec_touch.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-cs35l36_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-cs35l36_ko.asciipb
index 178647b..725f3f0 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-cs35l36_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-cs35l36_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "snd-soc-cs35l36.ko"
   }
   dest_file: "debug_memory/snd-soc-cs35l36.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-sdm845-max98927_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-sdm845-max98927_ko.asciipb
index febd49e..3e68a4b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-sdm845-max98927_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-sdm845-max98927_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "snd-soc-sdm845-max98927.ko"
   }
   dest_file: "debug_memory/snd-soc-sdm845-max98927.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-sdm845_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-sdm845_ko.asciipb
index 311868d..e640051 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-sdm845_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-sdm845_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "snd-soc-sdm845.ko"
   }
   dest_file: "debug_memory/snd-soc-sdm845.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd-spi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd-spi_ko.asciipb
index 7ed4702..0278fad 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd-spi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd-spi_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "snd-soc-wcd-spi.ko"
   }
   dest_file: "debug_memory/snd-soc-wcd-spi.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd934x_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd934x_ko.asciipb
index b361a04..a4eb3c5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd934x_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd934x_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "snd-soc-wcd934x.ko"
   }
   dest_file: "debug_memory/snd-soc-wcd934x.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd9xxx_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd9xxx_ko.asciipb
index f401876..5505972 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd9xxx_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd9xxx_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "snd-soc-wcd9xxx.ko"
   }
   dest_file: "debug_memory/snd-soc-wcd9xxx.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_videobuf2-memops_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_videobuf2-memops_ko.asciipb
index ef9a218..350570d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_videobuf2-memops_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_videobuf2-memops_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "debug_memory/videobuf2-memops.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_videobuf2-vmalloc_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_videobuf2-vmalloc_ko.asciipb
index 6193e40..d5dd33f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_videobuf2-vmalloc_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_videobuf2-vmalloc_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "debug_memory/videobuf2-vmalloc.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd-core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd-core_ko.asciipb
index 50029f1..feedcf1 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd-core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd-core_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "wcd-core.ko"
   }
   dest_file: "debug_memory/wcd-core.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd-dsp-glink_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd-dsp-glink_ko.asciipb
index 0541169..4d8e177 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd-dsp-glink_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd-dsp-glink_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "wcd-dsp-glink.ko"
   }
   dest_file: "debug_memory/wcd-dsp-glink.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wlan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wlan_ko.asciipb
index 349193c..4114430 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wlan_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wlan_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_debug_memory"
     source_file: "wlan.ko"
   }
   dest_file: "debug_memory/wlan.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_dtbo_img.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_dtbo_img.asciipb
index 869a230..958cdaa 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_dtbo_img.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_dtbo_img.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "dtbo.img"
   }
   dest_file: "dtbo.img"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_ftm5_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_ftm5_ko.asciipb
index aaafc7b..d63a53d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_ftm5_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_ftm5_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "ftm5.ko"
   }
   dest_file: "ftm5.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_heatmap_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_heatmap_ko.asciipb
index e76eddc..b16527f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_heatmap_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_heatmap_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "heatmap.ko"
   }
   dest_file: "heatmap.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_Image_lz4.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_Image_lz4.asciipb
index 824722c..9bf6ff4 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_Image_lz4.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_Image_lz4.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "Image.lz4"
   }
   dest_file: "kasan/Image.lz4"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_dtbo_img.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_dtbo_img.asciipb
index 36a1aa4..9e9547b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_dtbo_img.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_dtbo_img.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "dtbo.img"
   }
   dest_file: "kasan/dtbo.img"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_ftm5_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_ftm5_ko.asciipb
index c1b20ed..8c964c8 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_ftm5_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_ftm5_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "ftm5.ko"
   }
   dest_file: "kasan/ftm5.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_heatmap_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_heatmap_ko.asciipb
index 817fdf0..78a7581 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_heatmap_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_heatmap_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "heatmap.ko"
   }
   dest_file: "kasan/heatmap.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_pinctrl-wcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_pinctrl-wcd_ko.asciipb
index d47b7c9..a37083e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_pinctrl-wcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_pinctrl-wcd_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "pinctrl-wcd.ko"
   }
   dest_file: "kasan/pinctrl-wcd.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm845-v2_1_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm845-v2_1_dtb.asciipb
index 493bf6e..d84abc5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm845-v2_1_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm845-v2_1_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "sdm845-v2.1.dtb"
   }
   dest_file: "kasan/sdm845-v2.1.dtb"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm845-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm845-v2_dtb.asciipb
index 31005b1..94005d6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm845-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm845-v2_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "sdm845-v2.dtb"
   }
   dest_file: "kasan/sdm845-v2.dtb"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sec_touch_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sec_touch_ko.asciipb
index ce8713d..3661435 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sec_touch_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sec_touch_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "sec_touch.ko"
   }
   dest_file: "kasan/sec_touch.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-cs35l36_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-cs35l36_ko.asciipb
index 4b1179a..ff9a153 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-cs35l36_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-cs35l36_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "snd-soc-cs35l36.ko"
   }
   dest_file: "kasan/snd-soc-cs35l36.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-sdm845-max98927_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-sdm845-max98927_ko.asciipb
index 05b17d1..4c05a51 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-sdm845-max98927_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-sdm845-max98927_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "snd-soc-sdm845-max98927.ko"
   }
   dest_file: "kasan/snd-soc-sdm845-max98927.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-sdm845_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-sdm845_ko.asciipb
index 92e4267..fc2596a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-sdm845_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-sdm845_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "snd-soc-sdm845.ko"
   }
   dest_file: "kasan/snd-soc-sdm845.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd-spi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd-spi_ko.asciipb
index c671de1..ea4cf40 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd-spi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd-spi_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "snd-soc-wcd-spi.ko"
   }
   dest_file: "kasan/snd-soc-wcd-spi.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd934x_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd934x_ko.asciipb
index 4d807d9..4ee4c1a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd934x_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd934x_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "snd-soc-wcd934x.ko"
   }
   dest_file: "kasan/snd-soc-wcd934x.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd9xxx_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd9xxx_ko.asciipb
index 6a662f5..ef72b78 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd9xxx_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd9xxx_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "snd-soc-wcd9xxx.ko"
   }
   dest_file: "kasan/snd-soc-wcd9xxx.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_test_kasan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_test_kasan_ko.asciipb
index f77d10e..183ea3b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_test_kasan_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_test_kasan_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "test_kasan.ko"
   }
   dest_file: "kasan/test_kasan.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_videobuf2-memops_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_videobuf2-memops_ko.asciipb
index 47614e3..346f35e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_videobuf2-memops_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_videobuf2-memops_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "kasan/videobuf2-memops.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_videobuf2-vmalloc_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_videobuf2-vmalloc_ko.asciipb
index 68c50ac..2ac7671 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_videobuf2-vmalloc_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_videobuf2-vmalloc_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "kasan/videobuf2-vmalloc.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd-core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd-core_ko.asciipb
index afaaf58..b8e7468 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd-core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd-core_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "wcd-core.ko"
   }
   dest_file: "kasan/wcd-core.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd-dsp-glink_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd-dsp-glink_ko.asciipb
index 0cffbeb..8a2cf07 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd-dsp-glink_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd-dsp-glink_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "wcd-dsp-glink.ko"
   }
   dest_file: "kasan/wcd-dsp-glink.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wlan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wlan_ko.asciipb
index ef806ed..109ecfa 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wlan_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wlan_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross_kasan"
     source_file: "wlan.ko"
   }
   dest_file: "kasan/wlan.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_pinctrl-wcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_pinctrl-wcd_ko.asciipb
index f61a97a..1b0e009 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_pinctrl-wcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_pinctrl-wcd_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "pinctrl-wcd.ko"
   }
   dest_file: "pinctrl-wcd.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm845-v2_1_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm845-v2_1_dtb.asciipb
index 5d71b77..fbbb6bd 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm845-v2_1_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm845-v2_1_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "sdm845-v2.1.dtb"
   }
   dest_file: "sdm845-v2.1.dtb"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm845-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm845-v2_dtb.asciipb
index 66d7bfd..60f05d4 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm845-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm845-v2_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "sdm845-v2.dtb"
   }
   dest_file: "sdm845-v2.dtb"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_sec_touch_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_sec_touch_ko.asciipb
index cc96a48..5cbaea5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_sec_touch_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_sec_touch_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "sec_touch.ko"
   }
   dest_file: "sec_touch.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-cs35l36_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-cs35l36_ko.asciipb
index 8d6ef3e..2eb3338 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-cs35l36_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-cs35l36_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "snd-soc-cs35l36.ko"
   }
   dest_file: "snd-soc-cs35l36.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-sdm845-max98927_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-sdm845-max98927_ko.asciipb
index e123005..6c2d71f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-sdm845-max98927_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-sdm845-max98927_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "snd-soc-sdm845-max98927.ko"
   }
   dest_file: "snd-soc-sdm845-max98927.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-sdm845_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-sdm845_ko.asciipb
index 066e354..602bd01 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-sdm845_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-sdm845_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "snd-soc-sdm845.ko"
   }
   dest_file: "snd-soc-sdm845.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd-spi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd-spi_ko.asciipb
index a4325b4..7378a99 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd-spi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd-spi_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "snd-soc-wcd-spi.ko"
   }
   dest_file: "snd-soc-wcd-spi.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd934x_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd934x_ko.asciipb
index a566462..7c27672 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd934x_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd934x_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "snd-soc-wcd934x.ko"
   }
   dest_file: "snd-soc-wcd934x.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd9xxx_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd9xxx_ko.asciipb
index 84428c0..93a87f9 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd9xxx_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd9xxx_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "snd-soc-wcd9xxx.ko"
   }
   dest_file: "snd-soc-wcd9xxx.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_videobuf2-memops_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_videobuf2-memops_ko.asciipb
index 1d897c1..7d5fb4d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_videobuf2-memops_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_videobuf2-memops_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "videobuf2-memops.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_videobuf2-vmalloc_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_videobuf2-vmalloc_ko.asciipb
index ba8d706..f20356b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_videobuf2-vmalloc_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_videobuf2-vmalloc_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "videobuf2-vmalloc.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd-core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd-core_ko.asciipb
index e6d57ec..9c0a836 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd-core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd-core_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "wcd-core.ko"
   }
   dest_file: "wcd-core.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd-dsp-glink_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd-dsp-glink_ko.asciipb
index dbb00cf..b733701 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd-dsp-glink_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd-dsp-glink_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "wcd-dsp-glink.ko"
   }
   dest_file: "wcd-dsp-glink.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_wlan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_wlan_ko.asciipb
index ce29299..957719a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_wlan_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_wlan_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
     target: "kernel_bluecross"
     source_file: "wlan.ko"
   }
   dest_file: "wlan.ko"
-<<<<<<< HEAD   (d26006 Snap for 7050341 from dd69cd2f1fbe7004745a76e25f4e9e6967e4d8)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm-01144) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:17:00 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm200) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:22:29 UTC 2021"
->>>>>>> CHANGE (76ab65 crosshatch: update kernel-and-modules prebuilt [ DO NOT MERG)
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/Image.lz4 b/Image.lz4
index e69de29..b0eacdc 100644
--- a/Image.lz4
+++ b/Image.lz4
Binary files differ
diff --git a/debug_api/Image.lz4 b/debug_api/Image.lz4
index e69de29..89ba0cf 100644
--- a/debug_api/Image.lz4
+++ b/debug_api/Image.lz4
Binary files differ
diff --git a/debug_api/ftm5.ko b/debug_api/ftm5.ko
index e69de29..22a3a4c 100644
--- a/debug_api/ftm5.ko
+++ b/debug_api/ftm5.ko
Binary files differ
diff --git a/debug_api/heatmap.ko b/debug_api/heatmap.ko
index e69de29..cb25449 100644
--- a/debug_api/heatmap.ko
+++ b/debug_api/heatmap.ko
Binary files differ
diff --git a/debug_api/pinctrl-wcd.ko b/debug_api/pinctrl-wcd.ko
index e69de29..f936230 100644
--- a/debug_api/pinctrl-wcd.ko
+++ b/debug_api/pinctrl-wcd.ko
Binary files differ
diff --git a/debug_api/sec_touch.ko b/debug_api/sec_touch.ko
index e69de29..42ba865 100644
--- a/debug_api/sec_touch.ko
+++ b/debug_api/sec_touch.ko
Binary files differ
diff --git a/debug_api/snd-soc-cs35l36.ko b/debug_api/snd-soc-cs35l36.ko
index e69de29..d8f4907 100644
--- a/debug_api/snd-soc-cs35l36.ko
+++ b/debug_api/snd-soc-cs35l36.ko
Binary files differ
diff --git a/debug_api/snd-soc-sdm845-max98927.ko b/debug_api/snd-soc-sdm845-max98927.ko
index e69de29..22beb77 100644
--- a/debug_api/snd-soc-sdm845-max98927.ko
+++ b/debug_api/snd-soc-sdm845-max98927.ko
Binary files differ
diff --git a/debug_api/snd-soc-sdm845.ko b/debug_api/snd-soc-sdm845.ko
index e69de29..659644e 100644
--- a/debug_api/snd-soc-sdm845.ko
+++ b/debug_api/snd-soc-sdm845.ko
Binary files differ
diff --git a/debug_api/snd-soc-wcd-spi.ko b/debug_api/snd-soc-wcd-spi.ko
index e69de29..aa1d683 100644
--- a/debug_api/snd-soc-wcd-spi.ko
+++ b/debug_api/snd-soc-wcd-spi.ko
Binary files differ
diff --git a/debug_api/snd-soc-wcd934x.ko b/debug_api/snd-soc-wcd934x.ko
index e69de29..817708b 100644
--- a/debug_api/snd-soc-wcd934x.ko
+++ b/debug_api/snd-soc-wcd934x.ko
Binary files differ
diff --git a/debug_api/snd-soc-wcd9xxx.ko b/debug_api/snd-soc-wcd9xxx.ko
index e69de29..4287967 100644
--- a/debug_api/snd-soc-wcd9xxx.ko
+++ b/debug_api/snd-soc-wcd9xxx.ko
Binary files differ
diff --git a/debug_api/videobuf2-memops.ko b/debug_api/videobuf2-memops.ko
index e69de29..a7263cf 100644
--- a/debug_api/videobuf2-memops.ko
+++ b/debug_api/videobuf2-memops.ko
Binary files differ
diff --git a/debug_api/videobuf2-vmalloc.ko b/debug_api/videobuf2-vmalloc.ko
index e69de29..0541ef3 100644
--- a/debug_api/videobuf2-vmalloc.ko
+++ b/debug_api/videobuf2-vmalloc.ko
Binary files differ
diff --git a/debug_api/wcd-core.ko b/debug_api/wcd-core.ko
index e69de29..ffcfe31 100644
--- a/debug_api/wcd-core.ko
+++ b/debug_api/wcd-core.ko
Binary files differ
diff --git a/debug_api/wcd-dsp-glink.ko b/debug_api/wcd-dsp-glink.ko
index e69de29..c4cadf5 100644
--- a/debug_api/wcd-dsp-glink.ko
+++ b/debug_api/wcd-dsp-glink.ko
Binary files differ
diff --git a/debug_api/wlan.ko b/debug_api/wlan.ko
index e69de29..f13532f 100644
--- a/debug_api/wlan.ko
+++ b/debug_api/wlan.ko
Binary files differ
diff --git a/debug_hang/Image.lz4 b/debug_hang/Image.lz4
index e69de29..8a8cb5a 100644
--- a/debug_hang/Image.lz4
+++ b/debug_hang/Image.lz4
Binary files differ
diff --git a/debug_hang/ftm5.ko b/debug_hang/ftm5.ko
index e69de29..5c93526 100644
--- a/debug_hang/ftm5.ko
+++ b/debug_hang/ftm5.ko
Binary files differ
diff --git a/debug_hang/heatmap.ko b/debug_hang/heatmap.ko
index e69de29..30fcf74 100644
--- a/debug_hang/heatmap.ko
+++ b/debug_hang/heatmap.ko
Binary files differ
diff --git a/debug_hang/pinctrl-wcd.ko b/debug_hang/pinctrl-wcd.ko
index e69de29..e2966e7 100644
--- a/debug_hang/pinctrl-wcd.ko
+++ b/debug_hang/pinctrl-wcd.ko
Binary files differ
diff --git a/debug_hang/sec_touch.ko b/debug_hang/sec_touch.ko
index e69de29..c8ea88e 100644
--- a/debug_hang/sec_touch.ko
+++ b/debug_hang/sec_touch.ko
Binary files differ
diff --git a/debug_hang/snd-soc-cs35l36.ko b/debug_hang/snd-soc-cs35l36.ko
index e69de29..9319a88 100644
--- a/debug_hang/snd-soc-cs35l36.ko
+++ b/debug_hang/snd-soc-cs35l36.ko
Binary files differ
diff --git a/debug_hang/snd-soc-sdm845-max98927.ko b/debug_hang/snd-soc-sdm845-max98927.ko
index e69de29..0574773 100644
--- a/debug_hang/snd-soc-sdm845-max98927.ko
+++ b/debug_hang/snd-soc-sdm845-max98927.ko
Binary files differ
diff --git a/debug_hang/snd-soc-sdm845.ko b/debug_hang/snd-soc-sdm845.ko
index e69de29..1d30634 100644
--- a/debug_hang/snd-soc-sdm845.ko
+++ b/debug_hang/snd-soc-sdm845.ko
Binary files differ
diff --git a/debug_hang/snd-soc-wcd-spi.ko b/debug_hang/snd-soc-wcd-spi.ko
index e69de29..ae1f436 100644
--- a/debug_hang/snd-soc-wcd-spi.ko
+++ b/debug_hang/snd-soc-wcd-spi.ko
Binary files differ
diff --git a/debug_hang/snd-soc-wcd934x.ko b/debug_hang/snd-soc-wcd934x.ko
index e69de29..37093b4 100644
--- a/debug_hang/snd-soc-wcd934x.ko
+++ b/debug_hang/snd-soc-wcd934x.ko
Binary files differ
diff --git a/debug_hang/snd-soc-wcd9xxx.ko b/debug_hang/snd-soc-wcd9xxx.ko
index e69de29..ad75443 100644
--- a/debug_hang/snd-soc-wcd9xxx.ko
+++ b/debug_hang/snd-soc-wcd9xxx.ko
Binary files differ
diff --git a/debug_hang/videobuf2-memops.ko b/debug_hang/videobuf2-memops.ko
index e69de29..10aeea6 100644
--- a/debug_hang/videobuf2-memops.ko
+++ b/debug_hang/videobuf2-memops.ko
Binary files differ
diff --git a/debug_hang/videobuf2-vmalloc.ko b/debug_hang/videobuf2-vmalloc.ko
index e69de29..80ba9f8 100644
--- a/debug_hang/videobuf2-vmalloc.ko
+++ b/debug_hang/videobuf2-vmalloc.ko
Binary files differ
diff --git a/debug_hang/wcd-core.ko b/debug_hang/wcd-core.ko
index e69de29..3a4bbbd 100644
--- a/debug_hang/wcd-core.ko
+++ b/debug_hang/wcd-core.ko
Binary files differ
diff --git a/debug_hang/wcd-dsp-glink.ko b/debug_hang/wcd-dsp-glink.ko
index e69de29..62a3ca9 100644
--- a/debug_hang/wcd-dsp-glink.ko
+++ b/debug_hang/wcd-dsp-glink.ko
Binary files differ
diff --git a/debug_hang/wlan.ko b/debug_hang/wlan.ko
index e69de29..06a9605 100644
--- a/debug_hang/wlan.ko
+++ b/debug_hang/wlan.ko
Binary files differ
diff --git a/debug_locking/Image.lz4 b/debug_locking/Image.lz4
index e69de29..d80e622 100644
--- a/debug_locking/Image.lz4
+++ b/debug_locking/Image.lz4
Binary files differ
diff --git a/debug_locking/ftm5.ko b/debug_locking/ftm5.ko
index e69de29..5cee71b 100644
--- a/debug_locking/ftm5.ko
+++ b/debug_locking/ftm5.ko
Binary files differ
diff --git a/debug_locking/heatmap.ko b/debug_locking/heatmap.ko
index e69de29..4912ea8 100644
--- a/debug_locking/heatmap.ko
+++ b/debug_locking/heatmap.ko
Binary files differ
diff --git a/debug_locking/pinctrl-wcd.ko b/debug_locking/pinctrl-wcd.ko
index e69de29..d246164 100644
--- a/debug_locking/pinctrl-wcd.ko
+++ b/debug_locking/pinctrl-wcd.ko
Binary files differ
diff --git a/debug_locking/sec_touch.ko b/debug_locking/sec_touch.ko
index e69de29..904fcbc 100644
--- a/debug_locking/sec_touch.ko
+++ b/debug_locking/sec_touch.ko
Binary files differ
diff --git a/debug_locking/snd-soc-cs35l36.ko b/debug_locking/snd-soc-cs35l36.ko
index e69de29..4bc694b 100644
--- a/debug_locking/snd-soc-cs35l36.ko
+++ b/debug_locking/snd-soc-cs35l36.ko
Binary files differ
diff --git a/debug_locking/snd-soc-sdm845-max98927.ko b/debug_locking/snd-soc-sdm845-max98927.ko
index e69de29..07fac30 100644
--- a/debug_locking/snd-soc-sdm845-max98927.ko
+++ b/debug_locking/snd-soc-sdm845-max98927.ko
Binary files differ
diff --git a/debug_locking/snd-soc-sdm845.ko b/debug_locking/snd-soc-sdm845.ko
index e69de29..9142942 100644
--- a/debug_locking/snd-soc-sdm845.ko
+++ b/debug_locking/snd-soc-sdm845.ko
Binary files differ
diff --git a/debug_locking/snd-soc-wcd-spi.ko b/debug_locking/snd-soc-wcd-spi.ko
index e69de29..c65fb35 100644
--- a/debug_locking/snd-soc-wcd-spi.ko
+++ b/debug_locking/snd-soc-wcd-spi.ko
Binary files differ
diff --git a/debug_locking/snd-soc-wcd934x.ko b/debug_locking/snd-soc-wcd934x.ko
index e69de29..f02f120 100644
--- a/debug_locking/snd-soc-wcd934x.ko
+++ b/debug_locking/snd-soc-wcd934x.ko
Binary files differ
diff --git a/debug_locking/snd-soc-wcd9xxx.ko b/debug_locking/snd-soc-wcd9xxx.ko
index e69de29..7266bb6 100644
--- a/debug_locking/snd-soc-wcd9xxx.ko
+++ b/debug_locking/snd-soc-wcd9xxx.ko
Binary files differ
diff --git a/debug_locking/videobuf2-memops.ko b/debug_locking/videobuf2-memops.ko
index e69de29..f7f96c5 100644
--- a/debug_locking/videobuf2-memops.ko
+++ b/debug_locking/videobuf2-memops.ko
Binary files differ
diff --git a/debug_locking/videobuf2-vmalloc.ko b/debug_locking/videobuf2-vmalloc.ko
index e69de29..bf5bca6 100644
--- a/debug_locking/videobuf2-vmalloc.ko
+++ b/debug_locking/videobuf2-vmalloc.ko
Binary files differ
diff --git a/debug_locking/wcd-core.ko b/debug_locking/wcd-core.ko
index e69de29..81440a4 100644
--- a/debug_locking/wcd-core.ko
+++ b/debug_locking/wcd-core.ko
Binary files differ
diff --git a/debug_locking/wcd-dsp-glink.ko b/debug_locking/wcd-dsp-glink.ko
index e69de29..b900c10 100644
--- a/debug_locking/wcd-dsp-glink.ko
+++ b/debug_locking/wcd-dsp-glink.ko
Binary files differ
diff --git a/debug_locking/wlan.ko b/debug_locking/wlan.ko
index e69de29..ca70ad6 100644
--- a/debug_locking/wlan.ko
+++ b/debug_locking/wlan.ko
Binary files differ
diff --git a/debug_memory/Image.lz4 b/debug_memory/Image.lz4
index e69de29..c4e44af 100644
--- a/debug_memory/Image.lz4
+++ b/debug_memory/Image.lz4
Binary files differ
diff --git a/debug_memory/ftm5.ko b/debug_memory/ftm5.ko
index e69de29..88d656e 100644
--- a/debug_memory/ftm5.ko
+++ b/debug_memory/ftm5.ko
Binary files differ
diff --git a/debug_memory/heatmap.ko b/debug_memory/heatmap.ko
index e69de29..1e8288c 100644
--- a/debug_memory/heatmap.ko
+++ b/debug_memory/heatmap.ko
Binary files differ
diff --git a/debug_memory/pinctrl-wcd.ko b/debug_memory/pinctrl-wcd.ko
index e69de29..4c4ae51 100644
--- a/debug_memory/pinctrl-wcd.ko
+++ b/debug_memory/pinctrl-wcd.ko
Binary files differ
diff --git a/debug_memory/sec_touch.ko b/debug_memory/sec_touch.ko
index e69de29..b075139 100644
--- a/debug_memory/sec_touch.ko
+++ b/debug_memory/sec_touch.ko
Binary files differ
diff --git a/debug_memory/snd-soc-cs35l36.ko b/debug_memory/snd-soc-cs35l36.ko
index e69de29..8798809 100644
--- a/debug_memory/snd-soc-cs35l36.ko
+++ b/debug_memory/snd-soc-cs35l36.ko
Binary files differ
diff --git a/debug_memory/snd-soc-sdm845-max98927.ko b/debug_memory/snd-soc-sdm845-max98927.ko
index e69de29..085097c 100644
--- a/debug_memory/snd-soc-sdm845-max98927.ko
+++ b/debug_memory/snd-soc-sdm845-max98927.ko
Binary files differ
diff --git a/debug_memory/snd-soc-sdm845.ko b/debug_memory/snd-soc-sdm845.ko
index e69de29..cb06eea 100644
--- a/debug_memory/snd-soc-sdm845.ko
+++ b/debug_memory/snd-soc-sdm845.ko
Binary files differ
diff --git a/debug_memory/snd-soc-wcd-spi.ko b/debug_memory/snd-soc-wcd-spi.ko
index e69de29..f579ec1 100644
--- a/debug_memory/snd-soc-wcd-spi.ko
+++ b/debug_memory/snd-soc-wcd-spi.ko
Binary files differ
diff --git a/debug_memory/snd-soc-wcd934x.ko b/debug_memory/snd-soc-wcd934x.ko
index e69de29..63eb2bc 100644
--- a/debug_memory/snd-soc-wcd934x.ko
+++ b/debug_memory/snd-soc-wcd934x.ko
Binary files differ
diff --git a/debug_memory/snd-soc-wcd9xxx.ko b/debug_memory/snd-soc-wcd9xxx.ko
index e69de29..92786b3 100644
--- a/debug_memory/snd-soc-wcd9xxx.ko
+++ b/debug_memory/snd-soc-wcd9xxx.ko
Binary files differ
diff --git a/debug_memory/videobuf2-memops.ko b/debug_memory/videobuf2-memops.ko
index e69de29..a141dff 100644
--- a/debug_memory/videobuf2-memops.ko
+++ b/debug_memory/videobuf2-memops.ko
Binary files differ
diff --git a/debug_memory/videobuf2-vmalloc.ko b/debug_memory/videobuf2-vmalloc.ko
index e69de29..85e0b1d 100644
--- a/debug_memory/videobuf2-vmalloc.ko
+++ b/debug_memory/videobuf2-vmalloc.ko
Binary files differ
diff --git a/debug_memory/wcd-core.ko b/debug_memory/wcd-core.ko
index e69de29..338083d 100644
--- a/debug_memory/wcd-core.ko
+++ b/debug_memory/wcd-core.ko
Binary files differ
diff --git a/debug_memory/wcd-dsp-glink.ko b/debug_memory/wcd-dsp-glink.ko
index e69de29..ed38906 100644
--- a/debug_memory/wcd-dsp-glink.ko
+++ b/debug_memory/wcd-dsp-glink.ko
Binary files differ
diff --git a/debug_memory/wlan.ko b/debug_memory/wlan.ko
index e69de29..4f9e237 100644
--- a/debug_memory/wlan.ko
+++ b/debug_memory/wlan.ko
Binary files differ
diff --git a/ftm5.ko b/ftm5.ko
index e69de29..ee56a07 100644
--- a/ftm5.ko
+++ b/ftm5.ko
Binary files differ
diff --git a/heatmap.ko b/heatmap.ko
index e69de29..07d7905 100644
--- a/heatmap.ko
+++ b/heatmap.ko
Binary files differ
diff --git a/kasan/Image.lz4 b/kasan/Image.lz4
index e69de29..37b292f 100644
--- a/kasan/Image.lz4
+++ b/kasan/Image.lz4
Binary files differ
diff --git a/kasan/ftm5.ko b/kasan/ftm5.ko
index e69de29..9e0e925 100644
--- a/kasan/ftm5.ko
+++ b/kasan/ftm5.ko
Binary files differ
diff --git a/kasan/heatmap.ko b/kasan/heatmap.ko
index e69de29..a6d3080 100644
--- a/kasan/heatmap.ko
+++ b/kasan/heatmap.ko
Binary files differ
diff --git a/kasan/pinctrl-wcd.ko b/kasan/pinctrl-wcd.ko
index e69de29..f514dcc 100644
--- a/kasan/pinctrl-wcd.ko
+++ b/kasan/pinctrl-wcd.ko
Binary files differ
diff --git a/kasan/sec_touch.ko b/kasan/sec_touch.ko
index e69de29..adec52a 100644
--- a/kasan/sec_touch.ko
+++ b/kasan/sec_touch.ko
Binary files differ
diff --git a/kasan/snd-soc-cs35l36.ko b/kasan/snd-soc-cs35l36.ko
index e69de29..46cd917 100644
--- a/kasan/snd-soc-cs35l36.ko
+++ b/kasan/snd-soc-cs35l36.ko
Binary files differ
diff --git a/kasan/snd-soc-sdm845-max98927.ko b/kasan/snd-soc-sdm845-max98927.ko
index e69de29..4ea6642 100644
--- a/kasan/snd-soc-sdm845-max98927.ko
+++ b/kasan/snd-soc-sdm845-max98927.ko
Binary files differ
diff --git a/kasan/snd-soc-sdm845.ko b/kasan/snd-soc-sdm845.ko
index e69de29..d89d39a 100644
--- a/kasan/snd-soc-sdm845.ko
+++ b/kasan/snd-soc-sdm845.ko
Binary files differ
diff --git a/kasan/snd-soc-wcd-spi.ko b/kasan/snd-soc-wcd-spi.ko
index e69de29..ea72c19 100644
--- a/kasan/snd-soc-wcd-spi.ko
+++ b/kasan/snd-soc-wcd-spi.ko
Binary files differ
diff --git a/kasan/snd-soc-wcd934x.ko b/kasan/snd-soc-wcd934x.ko
index e69de29..095c58f 100644
--- a/kasan/snd-soc-wcd934x.ko
+++ b/kasan/snd-soc-wcd934x.ko
Binary files differ
diff --git a/kasan/snd-soc-wcd9xxx.ko b/kasan/snd-soc-wcd9xxx.ko
index e69de29..805fd3f 100644
--- a/kasan/snd-soc-wcd9xxx.ko
+++ b/kasan/snd-soc-wcd9xxx.ko
Binary files differ
diff --git a/kasan/test_kasan.ko b/kasan/test_kasan.ko
index e69de29..e80f659 100644
--- a/kasan/test_kasan.ko
+++ b/kasan/test_kasan.ko
Binary files differ
diff --git a/kasan/videobuf2-memops.ko b/kasan/videobuf2-memops.ko
index e69de29..88f672a 100644
--- a/kasan/videobuf2-memops.ko
+++ b/kasan/videobuf2-memops.ko
Binary files differ
diff --git a/kasan/videobuf2-vmalloc.ko b/kasan/videobuf2-vmalloc.ko
index e69de29..ff3dac1 100644
--- a/kasan/videobuf2-vmalloc.ko
+++ b/kasan/videobuf2-vmalloc.ko
Binary files differ
diff --git a/kasan/wcd-core.ko b/kasan/wcd-core.ko
index e69de29..1968785 100644
--- a/kasan/wcd-core.ko
+++ b/kasan/wcd-core.ko
Binary files differ
diff --git a/kasan/wcd-dsp-glink.ko b/kasan/wcd-dsp-glink.ko
index e69de29..f5fb3a3 100644
--- a/kasan/wcd-dsp-glink.ko
+++ b/kasan/wcd-dsp-glink.ko
Binary files differ
diff --git a/kasan/wlan.ko b/kasan/wlan.ko
index e69de29..8f6575f 100644
--- a/kasan/wlan.ko
+++ b/kasan/wlan.ko
Binary files differ
diff --git a/pinctrl-wcd.ko b/pinctrl-wcd.ko
index e69de29..a8a07ff 100644
--- a/pinctrl-wcd.ko
+++ b/pinctrl-wcd.ko
Binary files differ
diff --git a/sec_touch.ko b/sec_touch.ko
index e69de29..80381e5 100644
--- a/sec_touch.ko
+++ b/sec_touch.ko
Binary files differ
diff --git a/snd-soc-cs35l36.ko b/snd-soc-cs35l36.ko
index e69de29..2a6500e 100644
--- a/snd-soc-cs35l36.ko
+++ b/snd-soc-cs35l36.ko
Binary files differ
diff --git a/snd-soc-sdm845-max98927.ko b/snd-soc-sdm845-max98927.ko
index e69de29..4db3883 100644
--- a/snd-soc-sdm845-max98927.ko
+++ b/snd-soc-sdm845-max98927.ko
Binary files differ
diff --git a/snd-soc-sdm845.ko b/snd-soc-sdm845.ko
index e69de29..58aee75 100644
--- a/snd-soc-sdm845.ko
+++ b/snd-soc-sdm845.ko
Binary files differ
diff --git a/snd-soc-wcd-spi.ko b/snd-soc-wcd-spi.ko
index e69de29..e95ace6 100644
--- a/snd-soc-wcd-spi.ko
+++ b/snd-soc-wcd-spi.ko
Binary files differ
diff --git a/snd-soc-wcd934x.ko b/snd-soc-wcd934x.ko
index e69de29..4cbfa93 100644
--- a/snd-soc-wcd934x.ko
+++ b/snd-soc-wcd934x.ko
Binary files differ
diff --git a/snd-soc-wcd9xxx.ko b/snd-soc-wcd9xxx.ko
index e69de29..a57e25a 100644
--- a/snd-soc-wcd9xxx.ko
+++ b/snd-soc-wcd9xxx.ko
Binary files differ
diff --git a/videobuf2-memops.ko b/videobuf2-memops.ko
index e69de29..94db8e2 100644
--- a/videobuf2-memops.ko
+++ b/videobuf2-memops.ko
Binary files differ
diff --git a/videobuf2-vmalloc.ko b/videobuf2-vmalloc.ko
index e69de29..d8d9a5d 100644
--- a/videobuf2-vmalloc.ko
+++ b/videobuf2-vmalloc.ko
Binary files differ
diff --git a/wcd-core.ko b/wcd-core.ko
index e69de29..5c2e845 100644
--- a/wcd-core.ko
+++ b/wcd-core.ko
Binary files differ
diff --git a/wcd-dsp-glink.ko b/wcd-dsp-glink.ko
index e69de29..b80688d 100644
--- a/wcd-dsp-glink.ko
+++ b/wcd-dsp-glink.ko
Binary files differ
diff --git a/wlan.ko b/wlan.ko
index e69de29..a8b164e 100644
--- a/wlan.ko
+++ b/wlan.ko
Binary files differ