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 37ef2385e151431ffeb999f48be3805282c2fb88.

Reason for revert: b/177499518 - Broken build

Change-Id: I0958f3f23418fdfb13f21959429afb2140a75dba
(cherry picked from commit d8bae28d19cf142d9f0ce4a54519deb880d9ccfa)
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 02e119f..11c8c7d 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "Image.lz4"
   }
   dest_file: "Image.lz4"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_adsp_loader_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_adsp_loader_dlkm_ko.asciipb
index 3687563..9738063 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_adsp_loader_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_adsp_loader_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "adsp_loader_dlkm.ko"
   }
   dest_file: "adsp_loader_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_apr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_apr_dlkm_ko.asciipb
index 2124356..bcc4831 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_apr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_apr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "apr_dlkm.ko"
   }
   dest_file: "apr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_cs35l36_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_cs35l36_dlkm_ko.asciipb
index c716a65..7700661 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_cs35l36_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_cs35l36_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "cs35l36_dlkm.ko"
   }
   dest_file: "cs35l36_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 5e70016..4126d97 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "Image.lz4"
   }
   dest_file: "debug_api/Image.lz4"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_adsp_loader_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_adsp_loader_dlkm_ko.asciipb
index 92ad0b6..24860fe 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_adsp_loader_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_adsp_loader_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "adsp_loader_dlkm.ko"
   }
   dest_file: "debug_api/adsp_loader_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_apr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_apr_dlkm_ko.asciipb
index 23bba6e..5a9eba5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_apr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_apr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "apr_dlkm.ko"
   }
   dest_file: "debug_api/apr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_cs35l36_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_cs35l36_dlkm_ko.asciipb
index e7e1a11..ab5c339 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_cs35l36_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_cs35l36_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "cs35l36_dlkm.ko"
   }
   dest_file: "debug_api/cs35l36_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 0f6391c..8186d59 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "dtbo.img"
   }
   dest_file: "debug_api/dtbo.img"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 7c07c9b..09f0d71 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "ftm5.ko"
   }
   dest_file: "debug_api/ftm5.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 c7ce8fa..30f01d8 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "heatmap.ko"
   }
   dest_file: "debug_api/heatmap.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_incrementalfs_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_incrementalfs_ko.asciipb
index fe693ea..afc86f5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_incrementalfs_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_incrementalfs_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "incrementalfs.ko"
   }
   dest_file: "debug_api/incrementalfs.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_lkdtm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_lkdtm_ko.asciipb
index 470d1a4..191156a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_lkdtm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_lkdtm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "lkdtm.ko"
   }
   dest_file: "debug_api/lkdtm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_machine_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_machine_dlkm_ko.asciipb
index 98aa576..9111240 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_machine_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_machine_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "machine_dlkm.ko"
   }
   dest_file: "debug_api/machine_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_mbhc_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_mbhc_dlkm_ko.asciipb
index 007a99a..4bd07db 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_mbhc_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_mbhc_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "mbhc_dlkm.ko"
   }
   dest_file: "debug_api/mbhc_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_msm_11ad_proxy_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_msm_11ad_proxy_ko.asciipb
index 14cc75b..c7cb306 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_msm_11ad_proxy_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_msm_11ad_proxy_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "msm_11ad_proxy.ko"
   }
   dest_file: "debug_api/msm_11ad_proxy.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_native_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_native_dlkm_ko.asciipb
index 4f68bfd..89ad02e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_native_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_native_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "native_dlkm.ko"
   }
   dest_file: "debug_api/native_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_pinctrl_wcd_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_pinctrl_wcd_dlkm_ko.asciipb
index ad909de..327fd13 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_pinctrl_wcd_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_pinctrl_wcd_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "pinctrl_wcd_dlkm.ko"
   }
   dest_file: "debug_api/pinctrl_wcd_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_platform_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_platform_dlkm_ko.asciipb
index f908b36..394cfef 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_platform_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_platform_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "platform_dlkm.ko"
   }
   dest_file: "debug_api/platform_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_q6_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_q6_dlkm_ko.asciipb
index 4498385..8d76ca3 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_q6_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_q6_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "q6_dlkm.ko"
   }
   dest_file: "debug_api/q6_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_q6_notifier_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_q6_notifier_dlkm_ko.asciipb
index d1960a3..5c48ea7 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_q6_notifier_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_q6_notifier_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "q6_notifier_dlkm.ko"
   }
   dest_file: "debug_api/q6_notifier_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_q6_pdr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_q6_pdr_dlkm_ko.asciipb
index d702285..3d4601b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_q6_pdr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_q6_pdr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "q6_pdr_dlkm.ko"
   }
   dest_file: "debug_api/q6_pdr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sm8150-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sm8150-v2_dtb.asciipb
index 88ce625..76c2939 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sm8150-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sm8150-v2_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "sm8150-v2.dtb"
   }
   dest_file: "debug_api/sm8150-v2.dtb"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sm8150_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sm8150_dtb.asciipb
index 5a480c6..5f03e6d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sm8150_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sm8150_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "sm8150.dtb"
   }
   dest_file: "debug_api/sm8150.dtb"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_softdog_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_softdog_ko.asciipb
index cf26f24..10ae778 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_softdog_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_softdog_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "softdog.ko"
   }
   dest_file: "debug_api/softdog.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_stub_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_stub_dlkm_ko.asciipb
index 1c9d33c..a8bac8f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_stub_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_stub_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "stub_dlkm.ko"
   }
   dest_file: "debug_api/stub_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_swr_ctrl_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_swr_ctrl_dlkm_ko.asciipb
index f56d3cc..6df994c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_swr_ctrl_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_swr_ctrl_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "swr_ctrl_dlkm.ko"
   }
   dest_file: "debug_api/swr_ctrl_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_swr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_swr_dlkm_ko.asciipb
index 1649ba8..9e3325d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_swr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_swr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "swr_dlkm.ko"
   }
   dest_file: "debug_api/swr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_usf_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_usf_dlkm_ko.asciipb
index 696292b..d796148 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_usf_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_usf_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "usf_dlkm.ko"
   }
   dest_file: "debug_api/usf_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 dd5097e..68ef717 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "debug_api/videobuf2-memops.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 a909720..ec2c186 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "debug_api/videobuf2-vmalloc.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd934x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd934x_dlkm_ko.asciipb
index a852da9..db16341 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd934x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd934x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "wcd934x_dlkm.ko"
   }
   dest_file: "debug_api/wcd934x_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd9360_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd9360_dlkm_ko.asciipb
index a248960..f2ff572 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd9360_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd9360_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "wcd9360_dlkm.ko"
   }
   dest_file: "debug_api/wcd9360_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd9xxx_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd9xxx_dlkm_ko.asciipb
index 60eeca3..672ce46 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd9xxx_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd9xxx_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "wcd9xxx_dlkm.ko"
   }
   dest_file: "debug_api/wcd9xxx_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd_core_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd_core_dlkm_ko.asciipb
index 194a6e8..9b6d713 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd_core_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd_core_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "wcd_core_dlkm.ko"
   }
   dest_file: "debug_api/wcd_core_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd_cpe_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd_cpe_dlkm_ko.asciipb
index bfe13a6..0965435 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd_cpe_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd_cpe_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "wcd_cpe_dlkm.ko"
   }
   dest_file: "debug_api/wcd_cpe_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd_spi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd_spi_dlkm_ko.asciipb
index 4f5a5e3..e74308d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd_spi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd_spi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "wcd_spi_dlkm.ko"
   }
   dest_file: "debug_api/wcd_spi_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wglink_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wglink_dlkm_ko.asciipb
index 861ac67..cdc6594 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wglink_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wglink_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "wglink_dlkm.ko"
   }
   dest_file: "debug_api/wglink_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 5bc1ad0..61972a4 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "wlan.ko"
   }
   dest_file: "debug_api/wlan.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wsa881x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wsa881x_dlkm_ko.asciipb
index 4075a4b..8e8efaa 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wsa881x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wsa881x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_api"
     source_file: "wsa881x_dlkm.ko"
   }
   dest_file: "debug_api/wsa881x_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 2633868..e97c982 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "Image.lz4"
   }
   dest_file: "debug_hang/Image.lz4"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_adsp_loader_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_adsp_loader_dlkm_ko.asciipb
index b41fe02..5d400cd 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_adsp_loader_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_adsp_loader_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "adsp_loader_dlkm.ko"
   }
   dest_file: "debug_hang/adsp_loader_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_apr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_apr_dlkm_ko.asciipb
index 027e209..2562e8c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_apr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_apr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "apr_dlkm.ko"
   }
   dest_file: "debug_hang/apr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_cs35l36_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_cs35l36_dlkm_ko.asciipb
index c53cae6..837fc02 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_cs35l36_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_cs35l36_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "cs35l36_dlkm.ko"
   }
   dest_file: "debug_hang/cs35l36_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 4fb9d74..d60b2f0 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "dtbo.img"
   }
   dest_file: "debug_hang/dtbo.img"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 f0dbf72..045c284 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "ftm5.ko"
   }
   dest_file: "debug_hang/ftm5.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 915aed3..a07f320 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "heatmap.ko"
   }
   dest_file: "debug_hang/heatmap.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_incrementalfs_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_incrementalfs_ko.asciipb
index ec0b87e..3fde204 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_incrementalfs_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_incrementalfs_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "incrementalfs.ko"
   }
   dest_file: "debug_hang/incrementalfs.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_lkdtm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_lkdtm_ko.asciipb
index b7ca3b9..4cb607f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_lkdtm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_lkdtm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "lkdtm.ko"
   }
   dest_file: "debug_hang/lkdtm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_machine_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_machine_dlkm_ko.asciipb
index 3c0a386..1de85be 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_machine_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_machine_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "machine_dlkm.ko"
   }
   dest_file: "debug_hang/machine_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_mbhc_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_mbhc_dlkm_ko.asciipb
index cc54f48..06c7519 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_mbhc_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_mbhc_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "mbhc_dlkm.ko"
   }
   dest_file: "debug_hang/mbhc_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_msm_11ad_proxy_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_msm_11ad_proxy_ko.asciipb
index 3127ad7..501b9f5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_msm_11ad_proxy_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_msm_11ad_proxy_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "msm_11ad_proxy.ko"
   }
   dest_file: "debug_hang/msm_11ad_proxy.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_native_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_native_dlkm_ko.asciipb
index b02ecda..ff007af 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_native_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_native_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "native_dlkm.ko"
   }
   dest_file: "debug_hang/native_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_pinctrl_wcd_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_pinctrl_wcd_dlkm_ko.asciipb
index 18e355b..3da5808 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_pinctrl_wcd_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_pinctrl_wcd_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "pinctrl_wcd_dlkm.ko"
   }
   dest_file: "debug_hang/pinctrl_wcd_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_platform_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_platform_dlkm_ko.asciipb
index e821fd2..ed848c8 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_platform_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_platform_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "platform_dlkm.ko"
   }
   dest_file: "debug_hang/platform_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_q6_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_q6_dlkm_ko.asciipb
index d864152..c7e3473 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_q6_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_q6_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "q6_dlkm.ko"
   }
   dest_file: "debug_hang/q6_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_q6_notifier_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_q6_notifier_dlkm_ko.asciipb
index 336b132..9a8f107 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_q6_notifier_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_q6_notifier_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "q6_notifier_dlkm.ko"
   }
   dest_file: "debug_hang/q6_notifier_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_q6_pdr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_q6_pdr_dlkm_ko.asciipb
index 1e61b5f..b2658e5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_q6_pdr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_q6_pdr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "q6_pdr_dlkm.ko"
   }
   dest_file: "debug_hang/q6_pdr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sm8150-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sm8150-v2_dtb.asciipb
index bdf6071..26e6f76 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sm8150-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sm8150-v2_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "sm8150-v2.dtb"
   }
   dest_file: "debug_hang/sm8150-v2.dtb"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sm8150_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sm8150_dtb.asciipb
index d80779e..b14eaf2 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sm8150_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sm8150_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "sm8150.dtb"
   }
   dest_file: "debug_hang/sm8150.dtb"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_softdog_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_softdog_ko.asciipb
index d6265fc..4299533 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_softdog_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_softdog_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "softdog.ko"
   }
   dest_file: "debug_hang/softdog.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_stub_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_stub_dlkm_ko.asciipb
index 15b441b..fb86af6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_stub_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_stub_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "stub_dlkm.ko"
   }
   dest_file: "debug_hang/stub_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_swr_ctrl_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_swr_ctrl_dlkm_ko.asciipb
index 308a179..306a21e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_swr_ctrl_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_swr_ctrl_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "swr_ctrl_dlkm.ko"
   }
   dest_file: "debug_hang/swr_ctrl_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_swr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_swr_dlkm_ko.asciipb
index 95855cf..c3a4860 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_swr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_swr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "swr_dlkm.ko"
   }
   dest_file: "debug_hang/swr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_usf_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_usf_dlkm_ko.asciipb
index b59891b..01fe282 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_usf_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_usf_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "usf_dlkm.ko"
   }
   dest_file: "debug_hang/usf_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 422fd8c..2119234 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "debug_hang/videobuf2-memops.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 3071383..53d362f 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "debug_hang/videobuf2-vmalloc.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd934x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd934x_dlkm_ko.asciipb
index fe00cbf..0e23f5d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd934x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd934x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "wcd934x_dlkm.ko"
   }
   dest_file: "debug_hang/wcd934x_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd9360_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd9360_dlkm_ko.asciipb
index 9b376a0..4e523cc 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd9360_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd9360_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "wcd9360_dlkm.ko"
   }
   dest_file: "debug_hang/wcd9360_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd9xxx_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd9xxx_dlkm_ko.asciipb
index 7b2412f..bea6ace 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd9xxx_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd9xxx_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "wcd9xxx_dlkm.ko"
   }
   dest_file: "debug_hang/wcd9xxx_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd_core_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd_core_dlkm_ko.asciipb
index ebf0621..0fb2282 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd_core_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd_core_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "wcd_core_dlkm.ko"
   }
   dest_file: "debug_hang/wcd_core_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd_cpe_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd_cpe_dlkm_ko.asciipb
index c1168c2..ef0f2bd 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd_cpe_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd_cpe_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "wcd_cpe_dlkm.ko"
   }
   dest_file: "debug_hang/wcd_cpe_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd_spi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd_spi_dlkm_ko.asciipb
index 4f1ec95..68bfcea 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd_spi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd_spi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "wcd_spi_dlkm.ko"
   }
   dest_file: "debug_hang/wcd_spi_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wglink_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wglink_dlkm_ko.asciipb
index e5da5ce..45fb1ca 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wglink_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wglink_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "wglink_dlkm.ko"
   }
   dest_file: "debug_hang/wglink_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 52306d1..51bdc15 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "wlan.ko"
   }
   dest_file: "debug_hang/wlan.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wsa881x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wsa881x_dlkm_ko.asciipb
index e9d31e0..fad4498 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wsa881x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wsa881x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_hang"
     source_file: "wsa881x_dlkm.ko"
   }
   dest_file: "debug_hang/wsa881x_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 bf37541..341c657 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "Image.lz4"
   }
   dest_file: "debug_locking/Image.lz4"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_adsp_loader_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_adsp_loader_dlkm_ko.asciipb
index c7e1f06..01978bc 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_adsp_loader_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_adsp_loader_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "adsp_loader_dlkm.ko"
   }
   dest_file: "debug_locking/adsp_loader_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_apr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_apr_dlkm_ko.asciipb
index 6222cb2..866bead 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_apr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_apr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "apr_dlkm.ko"
   }
   dest_file: "debug_locking/apr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_cs35l36_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_cs35l36_dlkm_ko.asciipb
index 33d2025..133c9d5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_cs35l36_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_cs35l36_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "cs35l36_dlkm.ko"
   }
   dest_file: "debug_locking/cs35l36_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 5c6359d..5b210fe 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "dtbo.img"
   }
   dest_file: "debug_locking/dtbo.img"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 f83668e..574e75a 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "ftm5.ko"
   }
   dest_file: "debug_locking/ftm5.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 9247161..584bdde 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "heatmap.ko"
   }
   dest_file: "debug_locking/heatmap.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_incrementalfs_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_incrementalfs_ko.asciipb
index 3d45b2d..0dba145 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_incrementalfs_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_incrementalfs_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "incrementalfs.ko"
   }
   dest_file: "debug_locking/incrementalfs.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_lkdtm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_lkdtm_ko.asciipb
index 4f8acca..0dd8402 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_lkdtm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_lkdtm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "lkdtm.ko"
   }
   dest_file: "debug_locking/lkdtm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_machine_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_machine_dlkm_ko.asciipb
index 70d2dbc..b56b8d1 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_machine_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_machine_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "machine_dlkm.ko"
   }
   dest_file: "debug_locking/machine_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_mbhc_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_mbhc_dlkm_ko.asciipb
index 08cb4a1..b6bf6fe 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_mbhc_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_mbhc_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "mbhc_dlkm.ko"
   }
   dest_file: "debug_locking/mbhc_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_msm_11ad_proxy_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_msm_11ad_proxy_ko.asciipb
index 7a2f7ed..ff957da 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_msm_11ad_proxy_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_msm_11ad_proxy_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "msm_11ad_proxy.ko"
   }
   dest_file: "debug_locking/msm_11ad_proxy.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_native_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_native_dlkm_ko.asciipb
index 1fc200a..5d14fea 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_native_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_native_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "native_dlkm.ko"
   }
   dest_file: "debug_locking/native_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_pinctrl_wcd_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_pinctrl_wcd_dlkm_ko.asciipb
index 296960c..3ff38b9 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_pinctrl_wcd_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_pinctrl_wcd_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "pinctrl_wcd_dlkm.ko"
   }
   dest_file: "debug_locking/pinctrl_wcd_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_platform_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_platform_dlkm_ko.asciipb
index 3f37258..3e9101f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_platform_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_platform_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "platform_dlkm.ko"
   }
   dest_file: "debug_locking/platform_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_q6_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_q6_dlkm_ko.asciipb
index 931bc6a..134e0ed 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_q6_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_q6_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "q6_dlkm.ko"
   }
   dest_file: "debug_locking/q6_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_q6_notifier_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_q6_notifier_dlkm_ko.asciipb
index 803cf0d..b1487af 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_q6_notifier_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_q6_notifier_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "q6_notifier_dlkm.ko"
   }
   dest_file: "debug_locking/q6_notifier_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_q6_pdr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_q6_pdr_dlkm_ko.asciipb
index 567faac..4299f19 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_q6_pdr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_q6_pdr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "q6_pdr_dlkm.ko"
   }
   dest_file: "debug_locking/q6_pdr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sm8150-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sm8150-v2_dtb.asciipb
index a43de91..d45a2a2 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sm8150-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sm8150-v2_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "sm8150-v2.dtb"
   }
   dest_file: "debug_locking/sm8150-v2.dtb"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sm8150_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sm8150_dtb.asciipb
index 0d42831..02c13f9 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sm8150_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sm8150_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "sm8150.dtb"
   }
   dest_file: "debug_locking/sm8150.dtb"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_softdog_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_softdog_ko.asciipb
index 499b549..550b975 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_softdog_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_softdog_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "softdog.ko"
   }
   dest_file: "debug_locking/softdog.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_stub_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_stub_dlkm_ko.asciipb
index 40a2b3c..fb62fcf 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_stub_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_stub_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "stub_dlkm.ko"
   }
   dest_file: "debug_locking/stub_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_swr_ctrl_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_swr_ctrl_dlkm_ko.asciipb
index c53bce5..1d4c446 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_swr_ctrl_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_swr_ctrl_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "swr_ctrl_dlkm.ko"
   }
   dest_file: "debug_locking/swr_ctrl_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_swr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_swr_dlkm_ko.asciipb
index 2c2982f..df1e680 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_swr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_swr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "swr_dlkm.ko"
   }
   dest_file: "debug_locking/swr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_usf_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_usf_dlkm_ko.asciipb
index ffa257b..5cfd82b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_usf_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_usf_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "usf_dlkm.ko"
   }
   dest_file: "debug_locking/usf_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 6482771..cba035e 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "debug_locking/videobuf2-memops.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 41f4fd0..a9ef621 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "debug_locking/videobuf2-vmalloc.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd934x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd934x_dlkm_ko.asciipb
index cc8d9a1..4299f90 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd934x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd934x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "wcd934x_dlkm.ko"
   }
   dest_file: "debug_locking/wcd934x_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd9360_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd9360_dlkm_ko.asciipb
index 4d44f2e..2b1c52d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd9360_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd9360_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "wcd9360_dlkm.ko"
   }
   dest_file: "debug_locking/wcd9360_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd9xxx_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd9xxx_dlkm_ko.asciipb
index 685e502..52432d9 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd9xxx_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd9xxx_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "wcd9xxx_dlkm.ko"
   }
   dest_file: "debug_locking/wcd9xxx_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd_core_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd_core_dlkm_ko.asciipb
index 5f7b416..d84c6de 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd_core_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd_core_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "wcd_core_dlkm.ko"
   }
   dest_file: "debug_locking/wcd_core_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd_cpe_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd_cpe_dlkm_ko.asciipb
index 9828337..2721ad3 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd_cpe_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd_cpe_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "wcd_cpe_dlkm.ko"
   }
   dest_file: "debug_locking/wcd_cpe_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd_spi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd_spi_dlkm_ko.asciipb
index d87ab90..c3a108e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd_spi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd_spi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "wcd_spi_dlkm.ko"
   }
   dest_file: "debug_locking/wcd_spi_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wglink_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wglink_dlkm_ko.asciipb
index c5603da..55a9bed 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wglink_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wglink_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "wglink_dlkm.ko"
   }
   dest_file: "debug_locking/wglink_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 b1afc2b..14e7138 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "wlan.ko"
   }
   dest_file: "debug_locking/wlan.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wsa881x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wsa881x_dlkm_ko.asciipb
index 2ddc13e..496d31f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wsa881x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wsa881x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_locking"
     source_file: "wsa881x_dlkm.ko"
   }
   dest_file: "debug_locking/wsa881x_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 a8e51cb..df162d3 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "Image.lz4"
   }
   dest_file: "debug_memory/Image.lz4"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_adsp_loader_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_adsp_loader_dlkm_ko.asciipb
index 05ff928..5e863f2 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_adsp_loader_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_adsp_loader_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "adsp_loader_dlkm.ko"
   }
   dest_file: "debug_memory/adsp_loader_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_apr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_apr_dlkm_ko.asciipb
index d211690..1d0841c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_apr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_apr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "apr_dlkm.ko"
   }
   dest_file: "debug_memory/apr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_cs35l36_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_cs35l36_dlkm_ko.asciipb
index 4e56850..313c8df 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_cs35l36_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_cs35l36_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "cs35l36_dlkm.ko"
   }
   dest_file: "debug_memory/cs35l36_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 bed5350..12be3b5 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "dtbo.img"
   }
   dest_file: "debug_memory/dtbo.img"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 a37dddb..97c4558 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "ftm5.ko"
   }
   dest_file: "debug_memory/ftm5.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 03e182d..b3481ba 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "heatmap.ko"
   }
   dest_file: "debug_memory/heatmap.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_incrementalfs_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_incrementalfs_ko.asciipb
index 3b931c1..2283a97 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_incrementalfs_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_incrementalfs_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "incrementalfs.ko"
   }
   dest_file: "debug_memory/incrementalfs.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_lkdtm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_lkdtm_ko.asciipb
index 317dc14..eaefa62 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_lkdtm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_lkdtm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "lkdtm.ko"
   }
   dest_file: "debug_memory/lkdtm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_machine_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_machine_dlkm_ko.asciipb
index 977afd9..68db2f0 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_machine_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_machine_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "machine_dlkm.ko"
   }
   dest_file: "debug_memory/machine_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_mbhc_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_mbhc_dlkm_ko.asciipb
index d24a964..9a6071d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_mbhc_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_mbhc_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "mbhc_dlkm.ko"
   }
   dest_file: "debug_memory/mbhc_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_msm_11ad_proxy_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_msm_11ad_proxy_ko.asciipb
index 370b02a..642b706 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_msm_11ad_proxy_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_msm_11ad_proxy_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "msm_11ad_proxy.ko"
   }
   dest_file: "debug_memory/msm_11ad_proxy.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_native_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_native_dlkm_ko.asciipb
index a3c52ab..20f1776 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_native_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_native_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "native_dlkm.ko"
   }
   dest_file: "debug_memory/native_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_pinctrl_wcd_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_pinctrl_wcd_dlkm_ko.asciipb
index e1d02f5..63dfb57 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_pinctrl_wcd_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_pinctrl_wcd_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "pinctrl_wcd_dlkm.ko"
   }
   dest_file: "debug_memory/pinctrl_wcd_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_platform_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_platform_dlkm_ko.asciipb
index 8f833f7..e32392d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_platform_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_platform_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "platform_dlkm.ko"
   }
   dest_file: "debug_memory/platform_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_q6_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_q6_dlkm_ko.asciipb
index f8af0dc..d0a2f65 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_q6_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_q6_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "q6_dlkm.ko"
   }
   dest_file: "debug_memory/q6_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_q6_notifier_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_q6_notifier_dlkm_ko.asciipb
index 21c5ef9..5fd21d1 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_q6_notifier_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_q6_notifier_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "q6_notifier_dlkm.ko"
   }
   dest_file: "debug_memory/q6_notifier_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_q6_pdr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_q6_pdr_dlkm_ko.asciipb
index 7838875..5df6c8f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_q6_pdr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_q6_pdr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "q6_pdr_dlkm.ko"
   }
   dest_file: "debug_memory/q6_pdr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sm8150-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sm8150-v2_dtb.asciipb
index 4a28385..4e9c609 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sm8150-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sm8150-v2_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "sm8150-v2.dtb"
   }
   dest_file: "debug_memory/sm8150-v2.dtb"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sm8150_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sm8150_dtb.asciipb
index 784045f..ee149f1 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sm8150_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sm8150_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "sm8150.dtb"
   }
   dest_file: "debug_memory/sm8150.dtb"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_softdog_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_softdog_ko.asciipb
index 1df161f..a22b71c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_softdog_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_softdog_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "softdog.ko"
   }
   dest_file: "debug_memory/softdog.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_stub_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_stub_dlkm_ko.asciipb
index 24f0263..f5cf45e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_stub_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_stub_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "stub_dlkm.ko"
   }
   dest_file: "debug_memory/stub_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_swr_ctrl_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_swr_ctrl_dlkm_ko.asciipb
index 58cb640..acf9b6b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_swr_ctrl_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_swr_ctrl_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "swr_ctrl_dlkm.ko"
   }
   dest_file: "debug_memory/swr_ctrl_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_swr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_swr_dlkm_ko.asciipb
index a106710..70b7278 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_swr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_swr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "swr_dlkm.ko"
   }
   dest_file: "debug_memory/swr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_usf_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_usf_dlkm_ko.asciipb
index 71de90b..4b3e394 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_usf_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_usf_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "usf_dlkm.ko"
   }
   dest_file: "debug_memory/usf_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 2586622..62d9f27 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "debug_memory/videobuf2-memops.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 34bbb3e..04f8f13 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "debug_memory/videobuf2-vmalloc.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd934x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd934x_dlkm_ko.asciipb
index 693e763..273cf5b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd934x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd934x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "wcd934x_dlkm.ko"
   }
   dest_file: "debug_memory/wcd934x_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd9360_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd9360_dlkm_ko.asciipb
index ef402ed..cb4f990 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd9360_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd9360_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "wcd9360_dlkm.ko"
   }
   dest_file: "debug_memory/wcd9360_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd9xxx_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd9xxx_dlkm_ko.asciipb
index eab66de..1b13d36 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd9xxx_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd9xxx_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "wcd9xxx_dlkm.ko"
   }
   dest_file: "debug_memory/wcd9xxx_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd_core_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd_core_dlkm_ko.asciipb
index 1cc6642..b5b18d7 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd_core_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd_core_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "wcd_core_dlkm.ko"
   }
   dest_file: "debug_memory/wcd_core_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd_cpe_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd_cpe_dlkm_ko.asciipb
index 165ccb6..eb0e283 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd_cpe_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd_cpe_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "wcd_cpe_dlkm.ko"
   }
   dest_file: "debug_memory/wcd_cpe_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd_spi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd_spi_dlkm_ko.asciipb
index 5c5a3cb..e353bed 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd_spi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd_spi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "wcd_spi_dlkm.ko"
   }
   dest_file: "debug_memory/wcd_spi_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wglink_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wglink_dlkm_ko.asciipb
index 293f410..1cff450 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wglink_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wglink_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "wglink_dlkm.ko"
   }
   dest_file: "debug_memory/wglink_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 5a2cb82..4b954df 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "wlan.ko"
   }
   dest_file: "debug_memory/wlan.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wsa881x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wsa881x_dlkm_ko.asciipb
index 0f4a9b2..a2916d7 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wsa881x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wsa881x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_debug_memory"
     source_file: "wsa881x_dlkm.ko"
   }
   dest_file: "debug_memory/wsa881x_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 e82e9ab..13896f8 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "dtbo.img"
   }
   dest_file: "dtbo.img"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 d6474c3..f701c93 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "ftm5.ko"
   }
   dest_file: "ftm5.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 3a2d5fc..6ebfda8 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "heatmap.ko"
   }
   dest_file: "heatmap.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_incrementalfs_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_incrementalfs_ko.asciipb
index 472c067..3fc4b6b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_incrementalfs_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_incrementalfs_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "incrementalfs.ko"
   }
   dest_file: "incrementalfs.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 5000a82..833976a 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "Image.lz4"
   }
   dest_file: "kasan/Image.lz4"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_adsp_loader_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_adsp_loader_dlkm_ko.asciipb
index 6e67a76..ea50dec 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_adsp_loader_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_adsp_loader_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "adsp_loader_dlkm.ko"
   }
   dest_file: "kasan/adsp_loader_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_apr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_apr_dlkm_ko.asciipb
index 8cd15ba..aa585cc 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_apr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_apr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "apr_dlkm.ko"
   }
   dest_file: "kasan/apr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_cs35l36_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_cs35l36_dlkm_ko.asciipb
index 18aa18f..b4ad35b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_cs35l36_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_cs35l36_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "cs35l36_dlkm.ko"
   }
   dest_file: "kasan/cs35l36_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 66763c3..123a7b2 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "dtbo.img"
   }
   dest_file: "kasan/dtbo.img"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 d763a8b..1af4ba9 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "ftm5.ko"
   }
   dest_file: "kasan/ftm5.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 ca36fd7..ea944ce 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "heatmap.ko"
   }
   dest_file: "kasan/heatmap.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_incrementalfs_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_incrementalfs_ko.asciipb
index 4a05216..a2ed54a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_incrementalfs_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_incrementalfs_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "incrementalfs.ko"
   }
   dest_file: "kasan/incrementalfs.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_lkdtm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_lkdtm_ko.asciipb
index 4da71b5..dcad06c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_lkdtm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_lkdtm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "lkdtm.ko"
   }
   dest_file: "kasan/lkdtm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_machine_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_machine_dlkm_ko.asciipb
index 2ed398a..2fa53b8 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_machine_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_machine_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "machine_dlkm.ko"
   }
   dest_file: "kasan/machine_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_mbhc_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_mbhc_dlkm_ko.asciipb
index c2071f6..d518d4e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_mbhc_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_mbhc_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "mbhc_dlkm.ko"
   }
   dest_file: "kasan/mbhc_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_msm_11ad_proxy_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_msm_11ad_proxy_ko.asciipb
index 2f50479..162dd62 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_msm_11ad_proxy_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_msm_11ad_proxy_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "msm_11ad_proxy.ko"
   }
   dest_file: "kasan/msm_11ad_proxy.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_native_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_native_dlkm_ko.asciipb
index c6e8c0f..d46a407 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_native_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_native_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "native_dlkm.ko"
   }
   dest_file: "kasan/native_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_pinctrl_wcd_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_pinctrl_wcd_dlkm_ko.asciipb
index e72f7fb..8a082be 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_pinctrl_wcd_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_pinctrl_wcd_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "pinctrl_wcd_dlkm.ko"
   }
   dest_file: "kasan/pinctrl_wcd_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_platform_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_platform_dlkm_ko.asciipb
index df40c0f..269617e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_platform_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_platform_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "platform_dlkm.ko"
   }
   dest_file: "kasan/platform_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_q6_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_q6_dlkm_ko.asciipb
index 6c64c88..04698f8 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_q6_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_q6_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "q6_dlkm.ko"
   }
   dest_file: "kasan/q6_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_q6_notifier_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_q6_notifier_dlkm_ko.asciipb
index 6851535..63614da 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_q6_notifier_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_q6_notifier_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "q6_notifier_dlkm.ko"
   }
   dest_file: "kasan/q6_notifier_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_q6_pdr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_q6_pdr_dlkm_ko.asciipb
index c5a9f04..3013838 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_q6_pdr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_q6_pdr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "q6_pdr_dlkm.ko"
   }
   dest_file: "kasan/q6_pdr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sm8150-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sm8150-v2_dtb.asciipb
index e16e641..4014690 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sm8150-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sm8150-v2_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "sm8150-v2.dtb"
   }
   dest_file: "kasan/sm8150-v2.dtb"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sm8150_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sm8150_dtb.asciipb
index f324fc3..faa9da0 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sm8150_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sm8150_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "sm8150.dtb"
   }
   dest_file: "kasan/sm8150.dtb"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_softdog_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_softdog_ko.asciipb
index 98f09ca..c0a159f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_softdog_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_softdog_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "softdog.ko"
   }
   dest_file: "kasan/softdog.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_stub_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_stub_dlkm_ko.asciipb
index 3c92aff..31c9426 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_stub_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_stub_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "stub_dlkm.ko"
   }
   dest_file: "kasan/stub_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_swr_ctrl_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_swr_ctrl_dlkm_ko.asciipb
index 9177a48..cd0ced1 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_swr_ctrl_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_swr_ctrl_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "swr_ctrl_dlkm.ko"
   }
   dest_file: "kasan/swr_ctrl_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_swr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_swr_dlkm_ko.asciipb
index 3d0f50b..0e80883 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_swr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_swr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "swr_dlkm.ko"
   }
   dest_file: "kasan/swr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 8ddbe94..41c4e08 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "test_kasan.ko"
   }
   dest_file: "kasan/test_kasan.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_usf_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_usf_dlkm_ko.asciipb
index 03cb87b..2dc0888 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_usf_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_usf_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "usf_dlkm.ko"
   }
   dest_file: "kasan/usf_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 e12328e..5aa3176 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "kasan/videobuf2-memops.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 7933238..68e46bb 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "kasan/videobuf2-vmalloc.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd934x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd934x_dlkm_ko.asciipb
index 9b261ee..0f1a583 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd934x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd934x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "wcd934x_dlkm.ko"
   }
   dest_file: "kasan/wcd934x_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd9360_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd9360_dlkm_ko.asciipb
index 44f939e..d2ae11e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd9360_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd9360_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "wcd9360_dlkm.ko"
   }
   dest_file: "kasan/wcd9360_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd9xxx_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd9xxx_dlkm_ko.asciipb
index c052f55..6547804 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd9xxx_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd9xxx_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "wcd9xxx_dlkm.ko"
   }
   dest_file: "kasan/wcd9xxx_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd_core_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd_core_dlkm_ko.asciipb
index fa833a3..22260e9 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd_core_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd_core_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "wcd_core_dlkm.ko"
   }
   dest_file: "kasan/wcd_core_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd_cpe_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd_cpe_dlkm_ko.asciipb
index 0aaf2de..2259fc9 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd_cpe_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd_cpe_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "wcd_cpe_dlkm.ko"
   }
   dest_file: "kasan/wcd_cpe_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd_spi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd_spi_dlkm_ko.asciipb
index 5f68001..dc659b3 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd_spi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd_spi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "wcd_spi_dlkm.ko"
   }
   dest_file: "kasan/wcd_spi_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wglink_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wglink_dlkm_ko.asciipb
index fdc0688..47fd728 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wglink_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wglink_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "wglink_dlkm.ko"
   }
   dest_file: "kasan/wglink_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 8fc144a..2e8caed 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "wlan.ko"
   }
   dest_file: "kasan/wlan.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wsa881x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wsa881x_dlkm_ko.asciipb
index 386b15d..c6d96eb 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wsa881x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wsa881x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_kasan"
     source_file: "wsa881x_dlkm.ko"
   }
   dest_file: "kasan/wsa881x_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kernel-uapi-headers_tar_gz.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kernel-uapi-headers_tar_gz.asciipb
index 914c948..c7b6d5e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kernel-uapi-headers_tar_gz.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kernel-uapi-headers_tar_gz.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "kernel-uapi-headers.tar.gz"
   }
   dest_file: "kernel-uapi-headers.tar.gz"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_lkdtm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_lkdtm_ko.asciipb
index c45fccc..cb3d85f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_lkdtm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_lkdtm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "lkdtm.ko"
   }
   dest_file: "lkdtm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_machine_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_machine_dlkm_ko.asciipb
index 9f4107e..9fdf511 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_machine_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_machine_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "machine_dlkm.ko"
   }
   dest_file: "machine_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_mbhc_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_mbhc_dlkm_ko.asciipb
index 40992a1..d075a66 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_mbhc_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_mbhc_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "mbhc_dlkm.ko"
   }
   dest_file: "mbhc_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_msm_11ad_proxy_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_msm_11ad_proxy_ko.asciipb
index 3b2bf83..f1b2c8a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_msm_11ad_proxy_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_msm_11ad_proxy_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "msm_11ad_proxy.ko"
   }
   dest_file: "msm_11ad_proxy.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_native_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_native_dlkm_ko.asciipb
index 083a258..2108c18 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_native_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_native_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "native_dlkm.ko"
   }
   dest_file: "native_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_pinctrl_wcd_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_pinctrl_wcd_dlkm_ko.asciipb
index 6c1ab83..049ab95 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_pinctrl_wcd_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_pinctrl_wcd_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "pinctrl_wcd_dlkm.ko"
   }
   dest_file: "pinctrl_wcd_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_platform_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_platform_dlkm_ko.asciipb
index e2ef54e..98306f9 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_platform_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_platform_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "platform_dlkm.ko"
   }
   dest_file: "platform_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_q6_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_q6_dlkm_ko.asciipb
index 17f9bdd..e7311f1 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_q6_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_q6_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "q6_dlkm.ko"
   }
   dest_file: "q6_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_q6_notifier_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_q6_notifier_dlkm_ko.asciipb
index d6d5707..ebef66e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_q6_notifier_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_q6_notifier_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "q6_notifier_dlkm.ko"
   }
   dest_file: "q6_notifier_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_q6_pdr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_q6_pdr_dlkm_ko.asciipb
index 1cb2391..908ba3a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_q6_pdr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_q6_pdr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "q6_pdr_dlkm.ko"
   }
   dest_file: "q6_pdr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_sm8150-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_sm8150-v2_dtb.asciipb
index a871c3b..ab75d7c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_sm8150-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_sm8150-v2_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "sm8150-v2.dtb"
   }
   dest_file: "sm8150-v2.dtb"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_sm8150_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_sm8150_dtb.asciipb
index f56fafc..e58e4c9 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_sm8150_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_sm8150_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "sm8150.dtb"
   }
   dest_file: "sm8150.dtb"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_softdog_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_softdog_ko.asciipb
index 418afeb..fb9019f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_softdog_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_softdog_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "softdog.ko"
   }
   dest_file: "softdog.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_stub_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_stub_dlkm_ko.asciipb
index 48778f8..39fe10e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_stub_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_stub_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "stub_dlkm.ko"
   }
   dest_file: "stub_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_swr_ctrl_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_swr_ctrl_dlkm_ko.asciipb
index 4335f41..cdeaa3b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_swr_ctrl_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_swr_ctrl_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "swr_ctrl_dlkm.ko"
   }
   dest_file: "swr_ctrl_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_swr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_swr_dlkm_ko.asciipb
index 16eeb5f..bbee577 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_swr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_swr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "swr_dlkm.ko"
   }
   dest_file: "swr_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_usf_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_usf_dlkm_ko.asciipb
index 3b502cc..2ae1c38 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_usf_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_usf_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "usf_dlkm.ko"
   }
   dest_file: "usf_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 9095163..5ce0a76 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "videobuf2-memops.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 03fe7ec..17b2e60 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "videobuf2-vmalloc.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd934x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd934x_dlkm_ko.asciipb
index e2fb911..4ce89dd 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd934x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd934x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "wcd934x_dlkm.ko"
   }
   dest_file: "wcd934x_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd9360_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd9360_dlkm_ko.asciipb
index 823235f..f4d864b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd9360_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd9360_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "wcd9360_dlkm.ko"
   }
   dest_file: "wcd9360_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd9xxx_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd9xxx_dlkm_ko.asciipb
index 94661df..1470c59 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd9xxx_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd9xxx_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "wcd9xxx_dlkm.ko"
   }
   dest_file: "wcd9xxx_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd_core_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd_core_dlkm_ko.asciipb
index 5d6e438..5d7a047 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd_core_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd_core_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "wcd_core_dlkm.ko"
   }
   dest_file: "wcd_core_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd_cpe_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd_cpe_dlkm_ko.asciipb
index cb36fdd..b864eec 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd_cpe_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd_cpe_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "wcd_cpe_dlkm.ko"
   }
   dest_file: "wcd_cpe_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd_spi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd_spi_dlkm_ko.asciipb
index 87161e5..61ce46e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd_spi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd_spi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "wcd_spi_dlkm.ko"
   }
   dest_file: "wcd_spi_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_wglink_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_wglink_dlkm_ko.asciipb
index f0383bb..4c37d19 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_wglink_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_wglink_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "wglink_dlkm.ko"
   }
   dest_file: "wglink_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-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 71bdc96..41e5eaf 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   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "wlan.ko"
   }
   dest_file: "wlan.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_wsa881x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_wsa881x_dlkm_ko.asciipb
index c2f24e2..5d5f47d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_wsa881x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_wsa881x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
     build_id: "7047026"
-=======
-    build_id: "7079165"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel"
     source_file: "wsa881x_dlkm.ko"
   }
   dest_file: "wsa881x_dlkm.ko"
-<<<<<<< HEAD   (247052 Snap for 7050341 from bfd9db1ad9283a6bea410838619c1bcc1ca8ff)
   version: "Linux version 4.14.199-g17a39139e65a-ab7047026 (android-build@abfarm395) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Tue Dec 22 21:41:43 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g815ef3fd6754-ab7079165 (android-build@abfarm-01127) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 08:57:58 UTC 2021"
->>>>>>> CHANGE (32658f coral: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/coral-kernel"
 }
diff --git a/Image.lz4 b/Image.lz4
index e69de29..4ae6f44 100644
--- a/Image.lz4
+++ b/Image.lz4
Binary files differ
diff --git a/adsp_loader_dlkm.ko b/adsp_loader_dlkm.ko
index e69de29..b29d1a8 100644
--- a/adsp_loader_dlkm.ko
+++ b/adsp_loader_dlkm.ko
Binary files differ
diff --git a/apr_dlkm.ko b/apr_dlkm.ko
index e69de29..1a0dcb1 100644
--- a/apr_dlkm.ko
+++ b/apr_dlkm.ko
Binary files differ
diff --git a/cs35l36_dlkm.ko b/cs35l36_dlkm.ko
index e69de29..6aff347 100644
--- a/cs35l36_dlkm.ko
+++ b/cs35l36_dlkm.ko
Binary files differ
diff --git a/debug_api/Image.lz4 b/debug_api/Image.lz4
index e69de29..5bbbaca 100644
--- a/debug_api/Image.lz4
+++ b/debug_api/Image.lz4
Binary files differ
diff --git a/debug_api/adsp_loader_dlkm.ko b/debug_api/adsp_loader_dlkm.ko
index e69de29..2340849 100644
--- a/debug_api/adsp_loader_dlkm.ko
+++ b/debug_api/adsp_loader_dlkm.ko
Binary files differ
diff --git a/debug_api/apr_dlkm.ko b/debug_api/apr_dlkm.ko
index e69de29..a406792 100644
--- a/debug_api/apr_dlkm.ko
+++ b/debug_api/apr_dlkm.ko
Binary files differ
diff --git a/debug_api/cs35l36_dlkm.ko b/debug_api/cs35l36_dlkm.ko
index e69de29..0788b6c 100644
--- a/debug_api/cs35l36_dlkm.ko
+++ b/debug_api/cs35l36_dlkm.ko
Binary files differ
diff --git a/debug_api/ftm5.ko b/debug_api/ftm5.ko
index e69de29..fd72e77 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..302b12f 100644
--- a/debug_api/heatmap.ko
+++ b/debug_api/heatmap.ko
Binary files differ
diff --git a/debug_api/incrementalfs.ko b/debug_api/incrementalfs.ko
index e69de29..c2cfebe 100644
--- a/debug_api/incrementalfs.ko
+++ b/debug_api/incrementalfs.ko
Binary files differ
diff --git a/debug_api/lkdtm.ko b/debug_api/lkdtm.ko
index e69de29..5e8a4eb 100644
--- a/debug_api/lkdtm.ko
+++ b/debug_api/lkdtm.ko
Binary files differ
diff --git a/debug_api/machine_dlkm.ko b/debug_api/machine_dlkm.ko
index e69de29..8870b88 100644
--- a/debug_api/machine_dlkm.ko
+++ b/debug_api/machine_dlkm.ko
Binary files differ
diff --git a/debug_api/mbhc_dlkm.ko b/debug_api/mbhc_dlkm.ko
index e69de29..f2befba 100644
--- a/debug_api/mbhc_dlkm.ko
+++ b/debug_api/mbhc_dlkm.ko
Binary files differ
diff --git a/debug_api/msm_11ad_proxy.ko b/debug_api/msm_11ad_proxy.ko
index e69de29..44b8c74 100644
--- a/debug_api/msm_11ad_proxy.ko
+++ b/debug_api/msm_11ad_proxy.ko
Binary files differ
diff --git a/debug_api/native_dlkm.ko b/debug_api/native_dlkm.ko
index e69de29..551fc25 100644
--- a/debug_api/native_dlkm.ko
+++ b/debug_api/native_dlkm.ko
Binary files differ
diff --git a/debug_api/pinctrl_wcd_dlkm.ko b/debug_api/pinctrl_wcd_dlkm.ko
index e69de29..8a8fbf4 100644
--- a/debug_api/pinctrl_wcd_dlkm.ko
+++ b/debug_api/pinctrl_wcd_dlkm.ko
Binary files differ
diff --git a/debug_api/platform_dlkm.ko b/debug_api/platform_dlkm.ko
index e69de29..dee9630 100644
--- a/debug_api/platform_dlkm.ko
+++ b/debug_api/platform_dlkm.ko
Binary files differ
diff --git a/debug_api/q6_dlkm.ko b/debug_api/q6_dlkm.ko
index e69de29..265def1 100644
--- a/debug_api/q6_dlkm.ko
+++ b/debug_api/q6_dlkm.ko
Binary files differ
diff --git a/debug_api/q6_notifier_dlkm.ko b/debug_api/q6_notifier_dlkm.ko
index e69de29..2b46547 100644
--- a/debug_api/q6_notifier_dlkm.ko
+++ b/debug_api/q6_notifier_dlkm.ko
Binary files differ
diff --git a/debug_api/q6_pdr_dlkm.ko b/debug_api/q6_pdr_dlkm.ko
index e69de29..277395b 100644
--- a/debug_api/q6_pdr_dlkm.ko
+++ b/debug_api/q6_pdr_dlkm.ko
Binary files differ
diff --git a/debug_api/softdog.ko b/debug_api/softdog.ko
index e69de29..ed16793 100644
--- a/debug_api/softdog.ko
+++ b/debug_api/softdog.ko
Binary files differ
diff --git a/debug_api/stub_dlkm.ko b/debug_api/stub_dlkm.ko
index e69de29..41bec08 100644
--- a/debug_api/stub_dlkm.ko
+++ b/debug_api/stub_dlkm.ko
Binary files differ
diff --git a/debug_api/swr_ctrl_dlkm.ko b/debug_api/swr_ctrl_dlkm.ko
index e69de29..18487a0 100644
--- a/debug_api/swr_ctrl_dlkm.ko
+++ b/debug_api/swr_ctrl_dlkm.ko
Binary files differ
diff --git a/debug_api/swr_dlkm.ko b/debug_api/swr_dlkm.ko
index e69de29..9977c39 100644
--- a/debug_api/swr_dlkm.ko
+++ b/debug_api/swr_dlkm.ko
Binary files differ
diff --git a/debug_api/usf_dlkm.ko b/debug_api/usf_dlkm.ko
index e69de29..a95fa68 100644
--- a/debug_api/usf_dlkm.ko
+++ b/debug_api/usf_dlkm.ko
Binary files differ
diff --git a/debug_api/videobuf2-memops.ko b/debug_api/videobuf2-memops.ko
index e69de29..2b7e861 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..b93a288 100644
--- a/debug_api/videobuf2-vmalloc.ko
+++ b/debug_api/videobuf2-vmalloc.ko
Binary files differ
diff --git a/debug_api/wcd934x_dlkm.ko b/debug_api/wcd934x_dlkm.ko
index e69de29..8c83949 100644
--- a/debug_api/wcd934x_dlkm.ko
+++ b/debug_api/wcd934x_dlkm.ko
Binary files differ
diff --git a/debug_api/wcd9360_dlkm.ko b/debug_api/wcd9360_dlkm.ko
index e69de29..8211dc5 100644
--- a/debug_api/wcd9360_dlkm.ko
+++ b/debug_api/wcd9360_dlkm.ko
Binary files differ
diff --git a/debug_api/wcd9xxx_dlkm.ko b/debug_api/wcd9xxx_dlkm.ko
index e69de29..9b177fc 100644
--- a/debug_api/wcd9xxx_dlkm.ko
+++ b/debug_api/wcd9xxx_dlkm.ko
Binary files differ
diff --git a/debug_api/wcd_core_dlkm.ko b/debug_api/wcd_core_dlkm.ko
index e69de29..fece354 100644
--- a/debug_api/wcd_core_dlkm.ko
+++ b/debug_api/wcd_core_dlkm.ko
Binary files differ
diff --git a/debug_api/wcd_cpe_dlkm.ko b/debug_api/wcd_cpe_dlkm.ko
index e69de29..2c731af 100644
--- a/debug_api/wcd_cpe_dlkm.ko
+++ b/debug_api/wcd_cpe_dlkm.ko
Binary files differ
diff --git a/debug_api/wcd_spi_dlkm.ko b/debug_api/wcd_spi_dlkm.ko
index e69de29..0116e60 100644
--- a/debug_api/wcd_spi_dlkm.ko
+++ b/debug_api/wcd_spi_dlkm.ko
Binary files differ
diff --git a/debug_api/wglink_dlkm.ko b/debug_api/wglink_dlkm.ko
index e69de29..68ba0e6 100644
--- a/debug_api/wglink_dlkm.ko
+++ b/debug_api/wglink_dlkm.ko
Binary files differ
diff --git a/debug_api/wlan.ko b/debug_api/wlan.ko
index e69de29..23d3ce7 100644
--- a/debug_api/wlan.ko
+++ b/debug_api/wlan.ko
Binary files differ
diff --git a/debug_api/wsa881x_dlkm.ko b/debug_api/wsa881x_dlkm.ko
index e69de29..b6fb665 100644
--- a/debug_api/wsa881x_dlkm.ko
+++ b/debug_api/wsa881x_dlkm.ko
Binary files differ
diff --git a/debug_hang/Image.lz4 b/debug_hang/Image.lz4
index e69de29..6ce8796 100644
--- a/debug_hang/Image.lz4
+++ b/debug_hang/Image.lz4
Binary files differ
diff --git a/debug_hang/adsp_loader_dlkm.ko b/debug_hang/adsp_loader_dlkm.ko
index e69de29..d6522c8 100644
--- a/debug_hang/adsp_loader_dlkm.ko
+++ b/debug_hang/adsp_loader_dlkm.ko
Binary files differ
diff --git a/debug_hang/apr_dlkm.ko b/debug_hang/apr_dlkm.ko
index e69de29..d514a82 100644
--- a/debug_hang/apr_dlkm.ko
+++ b/debug_hang/apr_dlkm.ko
Binary files differ
diff --git a/debug_hang/cs35l36_dlkm.ko b/debug_hang/cs35l36_dlkm.ko
index e69de29..03f90c7 100644
--- a/debug_hang/cs35l36_dlkm.ko
+++ b/debug_hang/cs35l36_dlkm.ko
Binary files differ
diff --git a/debug_hang/ftm5.ko b/debug_hang/ftm5.ko
index e69de29..5196d2f 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..5b226bb 100644
--- a/debug_hang/heatmap.ko
+++ b/debug_hang/heatmap.ko
Binary files differ
diff --git a/debug_hang/incrementalfs.ko b/debug_hang/incrementalfs.ko
index e69de29..d460175 100644
--- a/debug_hang/incrementalfs.ko
+++ b/debug_hang/incrementalfs.ko
Binary files differ
diff --git a/debug_hang/lkdtm.ko b/debug_hang/lkdtm.ko
index e69de29..2a990d9 100644
--- a/debug_hang/lkdtm.ko
+++ b/debug_hang/lkdtm.ko
Binary files differ
diff --git a/debug_hang/machine_dlkm.ko b/debug_hang/machine_dlkm.ko
index e69de29..7b2e130 100644
--- a/debug_hang/machine_dlkm.ko
+++ b/debug_hang/machine_dlkm.ko
Binary files differ
diff --git a/debug_hang/mbhc_dlkm.ko b/debug_hang/mbhc_dlkm.ko
index e69de29..1abf061 100644
--- a/debug_hang/mbhc_dlkm.ko
+++ b/debug_hang/mbhc_dlkm.ko
Binary files differ
diff --git a/debug_hang/msm_11ad_proxy.ko b/debug_hang/msm_11ad_proxy.ko
index e69de29..0302101 100644
--- a/debug_hang/msm_11ad_proxy.ko
+++ b/debug_hang/msm_11ad_proxy.ko
Binary files differ
diff --git a/debug_hang/native_dlkm.ko b/debug_hang/native_dlkm.ko
index e69de29..f2ed42a 100644
--- a/debug_hang/native_dlkm.ko
+++ b/debug_hang/native_dlkm.ko
Binary files differ
diff --git a/debug_hang/pinctrl_wcd_dlkm.ko b/debug_hang/pinctrl_wcd_dlkm.ko
index e69de29..7bccc5a 100644
--- a/debug_hang/pinctrl_wcd_dlkm.ko
+++ b/debug_hang/pinctrl_wcd_dlkm.ko
Binary files differ
diff --git a/debug_hang/platform_dlkm.ko b/debug_hang/platform_dlkm.ko
index e69de29..7e040e4 100644
--- a/debug_hang/platform_dlkm.ko
+++ b/debug_hang/platform_dlkm.ko
Binary files differ
diff --git a/debug_hang/q6_dlkm.ko b/debug_hang/q6_dlkm.ko
index e69de29..2804129 100644
--- a/debug_hang/q6_dlkm.ko
+++ b/debug_hang/q6_dlkm.ko
Binary files differ
diff --git a/debug_hang/q6_notifier_dlkm.ko b/debug_hang/q6_notifier_dlkm.ko
index e69de29..4fb6c30 100644
--- a/debug_hang/q6_notifier_dlkm.ko
+++ b/debug_hang/q6_notifier_dlkm.ko
Binary files differ
diff --git a/debug_hang/q6_pdr_dlkm.ko b/debug_hang/q6_pdr_dlkm.ko
index e69de29..9e15b5f 100644
--- a/debug_hang/q6_pdr_dlkm.ko
+++ b/debug_hang/q6_pdr_dlkm.ko
Binary files differ
diff --git a/debug_hang/softdog.ko b/debug_hang/softdog.ko
index e69de29..510bb78 100644
--- a/debug_hang/softdog.ko
+++ b/debug_hang/softdog.ko
Binary files differ
diff --git a/debug_hang/stub_dlkm.ko b/debug_hang/stub_dlkm.ko
index e69de29..4c6bf71 100644
--- a/debug_hang/stub_dlkm.ko
+++ b/debug_hang/stub_dlkm.ko
Binary files differ
diff --git a/debug_hang/swr_ctrl_dlkm.ko b/debug_hang/swr_ctrl_dlkm.ko
index e69de29..2d5ada1 100644
--- a/debug_hang/swr_ctrl_dlkm.ko
+++ b/debug_hang/swr_ctrl_dlkm.ko
Binary files differ
diff --git a/debug_hang/swr_dlkm.ko b/debug_hang/swr_dlkm.ko
index e69de29..d9a5657 100644
--- a/debug_hang/swr_dlkm.ko
+++ b/debug_hang/swr_dlkm.ko
Binary files differ
diff --git a/debug_hang/usf_dlkm.ko b/debug_hang/usf_dlkm.ko
index e69de29..610d337 100644
--- a/debug_hang/usf_dlkm.ko
+++ b/debug_hang/usf_dlkm.ko
Binary files differ
diff --git a/debug_hang/videobuf2-memops.ko b/debug_hang/videobuf2-memops.ko
index e69de29..b305220 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..b92648d 100644
--- a/debug_hang/videobuf2-vmalloc.ko
+++ b/debug_hang/videobuf2-vmalloc.ko
Binary files differ
diff --git a/debug_hang/wcd934x_dlkm.ko b/debug_hang/wcd934x_dlkm.ko
index e69de29..0429130 100644
--- a/debug_hang/wcd934x_dlkm.ko
+++ b/debug_hang/wcd934x_dlkm.ko
Binary files differ
diff --git a/debug_hang/wcd9360_dlkm.ko b/debug_hang/wcd9360_dlkm.ko
index e69de29..25992d5 100644
--- a/debug_hang/wcd9360_dlkm.ko
+++ b/debug_hang/wcd9360_dlkm.ko
Binary files differ
diff --git a/debug_hang/wcd9xxx_dlkm.ko b/debug_hang/wcd9xxx_dlkm.ko
index e69de29..99b0360 100644
--- a/debug_hang/wcd9xxx_dlkm.ko
+++ b/debug_hang/wcd9xxx_dlkm.ko
Binary files differ
diff --git a/debug_hang/wcd_core_dlkm.ko b/debug_hang/wcd_core_dlkm.ko
index e69de29..167dddf 100644
--- a/debug_hang/wcd_core_dlkm.ko
+++ b/debug_hang/wcd_core_dlkm.ko
Binary files differ
diff --git a/debug_hang/wcd_cpe_dlkm.ko b/debug_hang/wcd_cpe_dlkm.ko
index e69de29..27ad7c2 100644
--- a/debug_hang/wcd_cpe_dlkm.ko
+++ b/debug_hang/wcd_cpe_dlkm.ko
Binary files differ
diff --git a/debug_hang/wcd_spi_dlkm.ko b/debug_hang/wcd_spi_dlkm.ko
index e69de29..f7483b1 100644
--- a/debug_hang/wcd_spi_dlkm.ko
+++ b/debug_hang/wcd_spi_dlkm.ko
Binary files differ
diff --git a/debug_hang/wglink_dlkm.ko b/debug_hang/wglink_dlkm.ko
index e69de29..79e15f1 100644
--- a/debug_hang/wglink_dlkm.ko
+++ b/debug_hang/wglink_dlkm.ko
Binary files differ
diff --git a/debug_hang/wlan.ko b/debug_hang/wlan.ko
index e69de29..9ccde87 100644
--- a/debug_hang/wlan.ko
+++ b/debug_hang/wlan.ko
Binary files differ
diff --git a/debug_hang/wsa881x_dlkm.ko b/debug_hang/wsa881x_dlkm.ko
index e69de29..9c30c73 100644
--- a/debug_hang/wsa881x_dlkm.ko
+++ b/debug_hang/wsa881x_dlkm.ko
Binary files differ
diff --git a/debug_locking/Image.lz4 b/debug_locking/Image.lz4
index e69de29..aae1fdf 100644
--- a/debug_locking/Image.lz4
+++ b/debug_locking/Image.lz4
Binary files differ
diff --git a/debug_locking/adsp_loader_dlkm.ko b/debug_locking/adsp_loader_dlkm.ko
index e69de29..04a5dd4 100644
--- a/debug_locking/adsp_loader_dlkm.ko
+++ b/debug_locking/adsp_loader_dlkm.ko
Binary files differ
diff --git a/debug_locking/apr_dlkm.ko b/debug_locking/apr_dlkm.ko
index e69de29..aba85b6 100644
--- a/debug_locking/apr_dlkm.ko
+++ b/debug_locking/apr_dlkm.ko
Binary files differ
diff --git a/debug_locking/cs35l36_dlkm.ko b/debug_locking/cs35l36_dlkm.ko
index e69de29..fa0e8b9 100644
--- a/debug_locking/cs35l36_dlkm.ko
+++ b/debug_locking/cs35l36_dlkm.ko
Binary files differ
diff --git a/debug_locking/ftm5.ko b/debug_locking/ftm5.ko
index e69de29..338cae2 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..dfb6c9c 100644
--- a/debug_locking/heatmap.ko
+++ b/debug_locking/heatmap.ko
Binary files differ
diff --git a/debug_locking/incrementalfs.ko b/debug_locking/incrementalfs.ko
index e69de29..fc236a1 100644
--- a/debug_locking/incrementalfs.ko
+++ b/debug_locking/incrementalfs.ko
Binary files differ
diff --git a/debug_locking/lkdtm.ko b/debug_locking/lkdtm.ko
index e69de29..0cc8094 100644
--- a/debug_locking/lkdtm.ko
+++ b/debug_locking/lkdtm.ko
Binary files differ
diff --git a/debug_locking/machine_dlkm.ko b/debug_locking/machine_dlkm.ko
index e69de29..75b5260 100644
--- a/debug_locking/machine_dlkm.ko
+++ b/debug_locking/machine_dlkm.ko
Binary files differ
diff --git a/debug_locking/mbhc_dlkm.ko b/debug_locking/mbhc_dlkm.ko
index e69de29..e0c1752 100644
--- a/debug_locking/mbhc_dlkm.ko
+++ b/debug_locking/mbhc_dlkm.ko
Binary files differ
diff --git a/debug_locking/msm_11ad_proxy.ko b/debug_locking/msm_11ad_proxy.ko
index e69de29..0857d3f 100644
--- a/debug_locking/msm_11ad_proxy.ko
+++ b/debug_locking/msm_11ad_proxy.ko
Binary files differ
diff --git a/debug_locking/native_dlkm.ko b/debug_locking/native_dlkm.ko
index e69de29..c9f61c4 100644
--- a/debug_locking/native_dlkm.ko
+++ b/debug_locking/native_dlkm.ko
Binary files differ
diff --git a/debug_locking/pinctrl_wcd_dlkm.ko b/debug_locking/pinctrl_wcd_dlkm.ko
index e69de29..2015fc4 100644
--- a/debug_locking/pinctrl_wcd_dlkm.ko
+++ b/debug_locking/pinctrl_wcd_dlkm.ko
Binary files differ
diff --git a/debug_locking/platform_dlkm.ko b/debug_locking/platform_dlkm.ko
index e69de29..74b2441 100644
--- a/debug_locking/platform_dlkm.ko
+++ b/debug_locking/platform_dlkm.ko
Binary files differ
diff --git a/debug_locking/q6_dlkm.ko b/debug_locking/q6_dlkm.ko
index e69de29..b7dc93f 100644
--- a/debug_locking/q6_dlkm.ko
+++ b/debug_locking/q6_dlkm.ko
Binary files differ
diff --git a/debug_locking/q6_notifier_dlkm.ko b/debug_locking/q6_notifier_dlkm.ko
index e69de29..e8a5d3d 100644
--- a/debug_locking/q6_notifier_dlkm.ko
+++ b/debug_locking/q6_notifier_dlkm.ko
Binary files differ
diff --git a/debug_locking/q6_pdr_dlkm.ko b/debug_locking/q6_pdr_dlkm.ko
index e69de29..d3c0e3a 100644
--- a/debug_locking/q6_pdr_dlkm.ko
+++ b/debug_locking/q6_pdr_dlkm.ko
Binary files differ
diff --git a/debug_locking/softdog.ko b/debug_locking/softdog.ko
index e69de29..29165cb 100644
--- a/debug_locking/softdog.ko
+++ b/debug_locking/softdog.ko
Binary files differ
diff --git a/debug_locking/stub_dlkm.ko b/debug_locking/stub_dlkm.ko
index e69de29..a9673cc 100644
--- a/debug_locking/stub_dlkm.ko
+++ b/debug_locking/stub_dlkm.ko
Binary files differ
diff --git a/debug_locking/swr_ctrl_dlkm.ko b/debug_locking/swr_ctrl_dlkm.ko
index e69de29..ef0a502 100644
--- a/debug_locking/swr_ctrl_dlkm.ko
+++ b/debug_locking/swr_ctrl_dlkm.ko
Binary files differ
diff --git a/debug_locking/swr_dlkm.ko b/debug_locking/swr_dlkm.ko
index e69de29..871268e 100644
--- a/debug_locking/swr_dlkm.ko
+++ b/debug_locking/swr_dlkm.ko
Binary files differ
diff --git a/debug_locking/usf_dlkm.ko b/debug_locking/usf_dlkm.ko
index e69de29..1420300 100644
--- a/debug_locking/usf_dlkm.ko
+++ b/debug_locking/usf_dlkm.ko
Binary files differ
diff --git a/debug_locking/videobuf2-memops.ko b/debug_locking/videobuf2-memops.ko
index e69de29..3d79d52 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..67ac5cc 100644
--- a/debug_locking/videobuf2-vmalloc.ko
+++ b/debug_locking/videobuf2-vmalloc.ko
Binary files differ
diff --git a/debug_locking/wcd934x_dlkm.ko b/debug_locking/wcd934x_dlkm.ko
index e69de29..db6b398 100644
--- a/debug_locking/wcd934x_dlkm.ko
+++ b/debug_locking/wcd934x_dlkm.ko
Binary files differ
diff --git a/debug_locking/wcd9360_dlkm.ko b/debug_locking/wcd9360_dlkm.ko
index e69de29..883d0be 100644
--- a/debug_locking/wcd9360_dlkm.ko
+++ b/debug_locking/wcd9360_dlkm.ko
Binary files differ
diff --git a/debug_locking/wcd9xxx_dlkm.ko b/debug_locking/wcd9xxx_dlkm.ko
index e69de29..19afc72 100644
--- a/debug_locking/wcd9xxx_dlkm.ko
+++ b/debug_locking/wcd9xxx_dlkm.ko
Binary files differ
diff --git a/debug_locking/wcd_core_dlkm.ko b/debug_locking/wcd_core_dlkm.ko
index e69de29..3507a3d 100644
--- a/debug_locking/wcd_core_dlkm.ko
+++ b/debug_locking/wcd_core_dlkm.ko
Binary files differ
diff --git a/debug_locking/wcd_cpe_dlkm.ko b/debug_locking/wcd_cpe_dlkm.ko
index e69de29..12e1258 100644
--- a/debug_locking/wcd_cpe_dlkm.ko
+++ b/debug_locking/wcd_cpe_dlkm.ko
Binary files differ
diff --git a/debug_locking/wcd_spi_dlkm.ko b/debug_locking/wcd_spi_dlkm.ko
index e69de29..42ff3c8 100644
--- a/debug_locking/wcd_spi_dlkm.ko
+++ b/debug_locking/wcd_spi_dlkm.ko
Binary files differ
diff --git a/debug_locking/wglink_dlkm.ko b/debug_locking/wglink_dlkm.ko
index e69de29..07b0523 100644
--- a/debug_locking/wglink_dlkm.ko
+++ b/debug_locking/wglink_dlkm.ko
Binary files differ
diff --git a/debug_locking/wlan.ko b/debug_locking/wlan.ko
index e69de29..380164c 100644
--- a/debug_locking/wlan.ko
+++ b/debug_locking/wlan.ko
Binary files differ
diff --git a/debug_locking/wsa881x_dlkm.ko b/debug_locking/wsa881x_dlkm.ko
index e69de29..c9030b4 100644
--- a/debug_locking/wsa881x_dlkm.ko
+++ b/debug_locking/wsa881x_dlkm.ko
Binary files differ
diff --git a/debug_memory/Image.lz4 b/debug_memory/Image.lz4
index e69de29..e570f68 100644
--- a/debug_memory/Image.lz4
+++ b/debug_memory/Image.lz4
Binary files differ
diff --git a/debug_memory/adsp_loader_dlkm.ko b/debug_memory/adsp_loader_dlkm.ko
index e69de29..b36c820 100644
--- a/debug_memory/adsp_loader_dlkm.ko
+++ b/debug_memory/adsp_loader_dlkm.ko
Binary files differ
diff --git a/debug_memory/apr_dlkm.ko b/debug_memory/apr_dlkm.ko
index e69de29..6e0fe64 100644
--- a/debug_memory/apr_dlkm.ko
+++ b/debug_memory/apr_dlkm.ko
Binary files differ
diff --git a/debug_memory/cs35l36_dlkm.ko b/debug_memory/cs35l36_dlkm.ko
index e69de29..3caf157 100644
--- a/debug_memory/cs35l36_dlkm.ko
+++ b/debug_memory/cs35l36_dlkm.ko
Binary files differ
diff --git a/debug_memory/ftm5.ko b/debug_memory/ftm5.ko
index e69de29..f2ff10c 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..559c7da 100644
--- a/debug_memory/heatmap.ko
+++ b/debug_memory/heatmap.ko
Binary files differ
diff --git a/debug_memory/incrementalfs.ko b/debug_memory/incrementalfs.ko
index e69de29..f449cca 100644
--- a/debug_memory/incrementalfs.ko
+++ b/debug_memory/incrementalfs.ko
Binary files differ
diff --git a/debug_memory/lkdtm.ko b/debug_memory/lkdtm.ko
index e69de29..401c006 100644
--- a/debug_memory/lkdtm.ko
+++ b/debug_memory/lkdtm.ko
Binary files differ
diff --git a/debug_memory/machine_dlkm.ko b/debug_memory/machine_dlkm.ko
index e69de29..ff72ca7 100644
--- a/debug_memory/machine_dlkm.ko
+++ b/debug_memory/machine_dlkm.ko
Binary files differ
diff --git a/debug_memory/mbhc_dlkm.ko b/debug_memory/mbhc_dlkm.ko
index e69de29..f4bc3a2 100644
--- a/debug_memory/mbhc_dlkm.ko
+++ b/debug_memory/mbhc_dlkm.ko
Binary files differ
diff --git a/debug_memory/msm_11ad_proxy.ko b/debug_memory/msm_11ad_proxy.ko
index e69de29..9349861 100644
--- a/debug_memory/msm_11ad_proxy.ko
+++ b/debug_memory/msm_11ad_proxy.ko
Binary files differ
diff --git a/debug_memory/native_dlkm.ko b/debug_memory/native_dlkm.ko
index e69de29..527803c 100644
--- a/debug_memory/native_dlkm.ko
+++ b/debug_memory/native_dlkm.ko
Binary files differ
diff --git a/debug_memory/pinctrl_wcd_dlkm.ko b/debug_memory/pinctrl_wcd_dlkm.ko
index e69de29..ec1994d 100644
--- a/debug_memory/pinctrl_wcd_dlkm.ko
+++ b/debug_memory/pinctrl_wcd_dlkm.ko
Binary files differ
diff --git a/debug_memory/platform_dlkm.ko b/debug_memory/platform_dlkm.ko
index e69de29..7b95fd1 100644
--- a/debug_memory/platform_dlkm.ko
+++ b/debug_memory/platform_dlkm.ko
Binary files differ
diff --git a/debug_memory/q6_dlkm.ko b/debug_memory/q6_dlkm.ko
index e69de29..b712d1b 100644
--- a/debug_memory/q6_dlkm.ko
+++ b/debug_memory/q6_dlkm.ko
Binary files differ
diff --git a/debug_memory/q6_notifier_dlkm.ko b/debug_memory/q6_notifier_dlkm.ko
index e69de29..7013a54 100644
--- a/debug_memory/q6_notifier_dlkm.ko
+++ b/debug_memory/q6_notifier_dlkm.ko
Binary files differ
diff --git a/debug_memory/q6_pdr_dlkm.ko b/debug_memory/q6_pdr_dlkm.ko
index e69de29..80e3aa3 100644
--- a/debug_memory/q6_pdr_dlkm.ko
+++ b/debug_memory/q6_pdr_dlkm.ko
Binary files differ
diff --git a/debug_memory/softdog.ko b/debug_memory/softdog.ko
index e69de29..fe7eee6 100644
--- a/debug_memory/softdog.ko
+++ b/debug_memory/softdog.ko
Binary files differ
diff --git a/debug_memory/stub_dlkm.ko b/debug_memory/stub_dlkm.ko
index e69de29..d3e0ccb 100644
--- a/debug_memory/stub_dlkm.ko
+++ b/debug_memory/stub_dlkm.ko
Binary files differ
diff --git a/debug_memory/swr_ctrl_dlkm.ko b/debug_memory/swr_ctrl_dlkm.ko
index e69de29..b27fc95 100644
--- a/debug_memory/swr_ctrl_dlkm.ko
+++ b/debug_memory/swr_ctrl_dlkm.ko
Binary files differ
diff --git a/debug_memory/swr_dlkm.ko b/debug_memory/swr_dlkm.ko
index e69de29..895bbd2 100644
--- a/debug_memory/swr_dlkm.ko
+++ b/debug_memory/swr_dlkm.ko
Binary files differ
diff --git a/debug_memory/usf_dlkm.ko b/debug_memory/usf_dlkm.ko
index e69de29..22f696a 100644
--- a/debug_memory/usf_dlkm.ko
+++ b/debug_memory/usf_dlkm.ko
Binary files differ
diff --git a/debug_memory/videobuf2-memops.ko b/debug_memory/videobuf2-memops.ko
index e69de29..7338e04 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..6a8f354 100644
--- a/debug_memory/videobuf2-vmalloc.ko
+++ b/debug_memory/videobuf2-vmalloc.ko
Binary files differ
diff --git a/debug_memory/wcd934x_dlkm.ko b/debug_memory/wcd934x_dlkm.ko
index e69de29..eb334f6 100644
--- a/debug_memory/wcd934x_dlkm.ko
+++ b/debug_memory/wcd934x_dlkm.ko
Binary files differ
diff --git a/debug_memory/wcd9360_dlkm.ko b/debug_memory/wcd9360_dlkm.ko
index e69de29..8f2ff72 100644
--- a/debug_memory/wcd9360_dlkm.ko
+++ b/debug_memory/wcd9360_dlkm.ko
Binary files differ
diff --git a/debug_memory/wcd9xxx_dlkm.ko b/debug_memory/wcd9xxx_dlkm.ko
index e69de29..b0e07ba 100644
--- a/debug_memory/wcd9xxx_dlkm.ko
+++ b/debug_memory/wcd9xxx_dlkm.ko
Binary files differ
diff --git a/debug_memory/wcd_core_dlkm.ko b/debug_memory/wcd_core_dlkm.ko
index e69de29..fe92427 100644
--- a/debug_memory/wcd_core_dlkm.ko
+++ b/debug_memory/wcd_core_dlkm.ko
Binary files differ
diff --git a/debug_memory/wcd_cpe_dlkm.ko b/debug_memory/wcd_cpe_dlkm.ko
index e69de29..6c0d6bd 100644
--- a/debug_memory/wcd_cpe_dlkm.ko
+++ b/debug_memory/wcd_cpe_dlkm.ko
Binary files differ
diff --git a/debug_memory/wcd_spi_dlkm.ko b/debug_memory/wcd_spi_dlkm.ko
index e69de29..956f14d 100644
--- a/debug_memory/wcd_spi_dlkm.ko
+++ b/debug_memory/wcd_spi_dlkm.ko
Binary files differ
diff --git a/debug_memory/wglink_dlkm.ko b/debug_memory/wglink_dlkm.ko
index e69de29..f39f5e5 100644
--- a/debug_memory/wglink_dlkm.ko
+++ b/debug_memory/wglink_dlkm.ko
Binary files differ
diff --git a/debug_memory/wlan.ko b/debug_memory/wlan.ko
index e69de29..044ae8a 100644
--- a/debug_memory/wlan.ko
+++ b/debug_memory/wlan.ko
Binary files differ
diff --git a/debug_memory/wsa881x_dlkm.ko b/debug_memory/wsa881x_dlkm.ko
index e69de29..464fa76 100644
--- a/debug_memory/wsa881x_dlkm.ko
+++ b/debug_memory/wsa881x_dlkm.ko
Binary files differ
diff --git a/ftm5.ko b/ftm5.ko
index e69de29..39dd248 100644
--- a/ftm5.ko
+++ b/ftm5.ko
Binary files differ
diff --git a/heatmap.ko b/heatmap.ko
index e69de29..5260bf5 100644
--- a/heatmap.ko
+++ b/heatmap.ko
Binary files differ
diff --git a/incrementalfs.ko b/incrementalfs.ko
index e69de29..4e31145 100644
--- a/incrementalfs.ko
+++ b/incrementalfs.ko
Binary files differ
diff --git a/kasan/Image.lz4 b/kasan/Image.lz4
index e69de29..107145d 100644
--- a/kasan/Image.lz4
+++ b/kasan/Image.lz4
Binary files differ
diff --git a/kasan/adsp_loader_dlkm.ko b/kasan/adsp_loader_dlkm.ko
index e69de29..40346f9 100644
--- a/kasan/adsp_loader_dlkm.ko
+++ b/kasan/adsp_loader_dlkm.ko
Binary files differ
diff --git a/kasan/apr_dlkm.ko b/kasan/apr_dlkm.ko
index e69de29..1bd0680 100644
--- a/kasan/apr_dlkm.ko
+++ b/kasan/apr_dlkm.ko
Binary files differ
diff --git a/kasan/cs35l36_dlkm.ko b/kasan/cs35l36_dlkm.ko
index e69de29..3744dd8 100644
--- a/kasan/cs35l36_dlkm.ko
+++ b/kasan/cs35l36_dlkm.ko
Binary files differ
diff --git a/kasan/ftm5.ko b/kasan/ftm5.ko
index e69de29..90f2c12 100644
--- a/kasan/ftm5.ko
+++ b/kasan/ftm5.ko
Binary files differ
diff --git a/kasan/heatmap.ko b/kasan/heatmap.ko
index e69de29..187a157 100644
--- a/kasan/heatmap.ko
+++ b/kasan/heatmap.ko
Binary files differ
diff --git a/kasan/incrementalfs.ko b/kasan/incrementalfs.ko
index e69de29..ecfc485 100644
--- a/kasan/incrementalfs.ko
+++ b/kasan/incrementalfs.ko
Binary files differ
diff --git a/kasan/lkdtm.ko b/kasan/lkdtm.ko
index e69de29..7aa23fe 100644
--- a/kasan/lkdtm.ko
+++ b/kasan/lkdtm.ko
Binary files differ
diff --git a/kasan/machine_dlkm.ko b/kasan/machine_dlkm.ko
index e69de29..047e91a 100644
--- a/kasan/machine_dlkm.ko
+++ b/kasan/machine_dlkm.ko
Binary files differ
diff --git a/kasan/mbhc_dlkm.ko b/kasan/mbhc_dlkm.ko
index e69de29..77fcec2 100644
--- a/kasan/mbhc_dlkm.ko
+++ b/kasan/mbhc_dlkm.ko
Binary files differ
diff --git a/kasan/msm_11ad_proxy.ko b/kasan/msm_11ad_proxy.ko
index e69de29..297124b 100644
--- a/kasan/msm_11ad_proxy.ko
+++ b/kasan/msm_11ad_proxy.ko
Binary files differ
diff --git a/kasan/native_dlkm.ko b/kasan/native_dlkm.ko
index e69de29..9ebc20b 100644
--- a/kasan/native_dlkm.ko
+++ b/kasan/native_dlkm.ko
Binary files differ
diff --git a/kasan/pinctrl_wcd_dlkm.ko b/kasan/pinctrl_wcd_dlkm.ko
index e69de29..3dc8fab 100644
--- a/kasan/pinctrl_wcd_dlkm.ko
+++ b/kasan/pinctrl_wcd_dlkm.ko
Binary files differ
diff --git a/kasan/platform_dlkm.ko b/kasan/platform_dlkm.ko
index e69de29..85a43fa 100644
--- a/kasan/platform_dlkm.ko
+++ b/kasan/platform_dlkm.ko
Binary files differ
diff --git a/kasan/q6_dlkm.ko b/kasan/q6_dlkm.ko
index e69de29..fd76ef5 100644
--- a/kasan/q6_dlkm.ko
+++ b/kasan/q6_dlkm.ko
Binary files differ
diff --git a/kasan/q6_notifier_dlkm.ko b/kasan/q6_notifier_dlkm.ko
index e69de29..710639c 100644
--- a/kasan/q6_notifier_dlkm.ko
+++ b/kasan/q6_notifier_dlkm.ko
Binary files differ
diff --git a/kasan/q6_pdr_dlkm.ko b/kasan/q6_pdr_dlkm.ko
index e69de29..508e223 100644
--- a/kasan/q6_pdr_dlkm.ko
+++ b/kasan/q6_pdr_dlkm.ko
Binary files differ
diff --git a/kasan/softdog.ko b/kasan/softdog.ko
index e69de29..39a1694 100644
--- a/kasan/softdog.ko
+++ b/kasan/softdog.ko
Binary files differ
diff --git a/kasan/stub_dlkm.ko b/kasan/stub_dlkm.ko
index e69de29..5b69c5a 100644
--- a/kasan/stub_dlkm.ko
+++ b/kasan/stub_dlkm.ko
Binary files differ
diff --git a/kasan/swr_ctrl_dlkm.ko b/kasan/swr_ctrl_dlkm.ko
index e69de29..c5f4329 100644
--- a/kasan/swr_ctrl_dlkm.ko
+++ b/kasan/swr_ctrl_dlkm.ko
Binary files differ
diff --git a/kasan/swr_dlkm.ko b/kasan/swr_dlkm.ko
index e69de29..1802229 100644
--- a/kasan/swr_dlkm.ko
+++ b/kasan/swr_dlkm.ko
Binary files differ
diff --git a/kasan/test_kasan.ko b/kasan/test_kasan.ko
index e69de29..2911342 100644
--- a/kasan/test_kasan.ko
+++ b/kasan/test_kasan.ko
Binary files differ
diff --git a/kasan/usf_dlkm.ko b/kasan/usf_dlkm.ko
index e69de29..5d5394d 100644
--- a/kasan/usf_dlkm.ko
+++ b/kasan/usf_dlkm.ko
Binary files differ
diff --git a/kasan/videobuf2-memops.ko b/kasan/videobuf2-memops.ko
index e69de29..2265eb0 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..eac514b 100644
--- a/kasan/videobuf2-vmalloc.ko
+++ b/kasan/videobuf2-vmalloc.ko
Binary files differ
diff --git a/kasan/wcd934x_dlkm.ko b/kasan/wcd934x_dlkm.ko
index e69de29..164b272 100644
--- a/kasan/wcd934x_dlkm.ko
+++ b/kasan/wcd934x_dlkm.ko
Binary files differ
diff --git a/kasan/wcd9360_dlkm.ko b/kasan/wcd9360_dlkm.ko
index e69de29..587926f 100644
--- a/kasan/wcd9360_dlkm.ko
+++ b/kasan/wcd9360_dlkm.ko
Binary files differ
diff --git a/kasan/wcd9xxx_dlkm.ko b/kasan/wcd9xxx_dlkm.ko
index e69de29..902ae51 100644
--- a/kasan/wcd9xxx_dlkm.ko
+++ b/kasan/wcd9xxx_dlkm.ko
Binary files differ
diff --git a/kasan/wcd_core_dlkm.ko b/kasan/wcd_core_dlkm.ko
index e69de29..a96ca2c 100644
--- a/kasan/wcd_core_dlkm.ko
+++ b/kasan/wcd_core_dlkm.ko
Binary files differ
diff --git a/kasan/wcd_cpe_dlkm.ko b/kasan/wcd_cpe_dlkm.ko
index e69de29..1d7ee1c 100644
--- a/kasan/wcd_cpe_dlkm.ko
+++ b/kasan/wcd_cpe_dlkm.ko
Binary files differ
diff --git a/kasan/wcd_spi_dlkm.ko b/kasan/wcd_spi_dlkm.ko
index e69de29..4f0c35a 100644
--- a/kasan/wcd_spi_dlkm.ko
+++ b/kasan/wcd_spi_dlkm.ko
Binary files differ
diff --git a/kasan/wglink_dlkm.ko b/kasan/wglink_dlkm.ko
index e69de29..0a3deeb 100644
--- a/kasan/wglink_dlkm.ko
+++ b/kasan/wglink_dlkm.ko
Binary files differ
diff --git a/kasan/wlan.ko b/kasan/wlan.ko
index e69de29..97915ae 100644
--- a/kasan/wlan.ko
+++ b/kasan/wlan.ko
Binary files differ
diff --git a/kasan/wsa881x_dlkm.ko b/kasan/wsa881x_dlkm.ko
index e69de29..e012b64 100644
--- a/kasan/wsa881x_dlkm.ko
+++ b/kasan/wsa881x_dlkm.ko
Binary files differ
diff --git a/kernel-uapi-headers.tar.gz b/kernel-uapi-headers.tar.gz
index e69de29..86e0d64 100644
--- a/kernel-uapi-headers.tar.gz
+++ b/kernel-uapi-headers.tar.gz
Binary files differ
diff --git a/lkdtm.ko b/lkdtm.ko
index e69de29..18beec6 100644
--- a/lkdtm.ko
+++ b/lkdtm.ko
Binary files differ
diff --git a/machine_dlkm.ko b/machine_dlkm.ko
index e69de29..ec111d3 100644
--- a/machine_dlkm.ko
+++ b/machine_dlkm.ko
Binary files differ
diff --git a/mbhc_dlkm.ko b/mbhc_dlkm.ko
index e69de29..b5bc3ad 100644
--- a/mbhc_dlkm.ko
+++ b/mbhc_dlkm.ko
Binary files differ
diff --git a/msm_11ad_proxy.ko b/msm_11ad_proxy.ko
index e69de29..17f59fd 100644
--- a/msm_11ad_proxy.ko
+++ b/msm_11ad_proxy.ko
Binary files differ
diff --git a/native_dlkm.ko b/native_dlkm.ko
index e69de29..9e7b085 100644
--- a/native_dlkm.ko
+++ b/native_dlkm.ko
Binary files differ
diff --git a/pinctrl_wcd_dlkm.ko b/pinctrl_wcd_dlkm.ko
index e69de29..ad36f52 100644
--- a/pinctrl_wcd_dlkm.ko
+++ b/pinctrl_wcd_dlkm.ko
Binary files differ
diff --git a/platform_dlkm.ko b/platform_dlkm.ko
index e69de29..17e4b5d 100644
--- a/platform_dlkm.ko
+++ b/platform_dlkm.ko
Binary files differ
diff --git a/q6_dlkm.ko b/q6_dlkm.ko
index e69de29..a93a1ce 100644
--- a/q6_dlkm.ko
+++ b/q6_dlkm.ko
Binary files differ
diff --git a/q6_notifier_dlkm.ko b/q6_notifier_dlkm.ko
index e69de29..d1d0502 100644
--- a/q6_notifier_dlkm.ko
+++ b/q6_notifier_dlkm.ko
Binary files differ
diff --git a/q6_pdr_dlkm.ko b/q6_pdr_dlkm.ko
index e69de29..eac6fd3 100644
--- a/q6_pdr_dlkm.ko
+++ b/q6_pdr_dlkm.ko
Binary files differ
diff --git a/softdog.ko b/softdog.ko
index e69de29..849f8be 100644
--- a/softdog.ko
+++ b/softdog.ko
Binary files differ
diff --git a/stub_dlkm.ko b/stub_dlkm.ko
index e69de29..310004c 100644
--- a/stub_dlkm.ko
+++ b/stub_dlkm.ko
Binary files differ
diff --git a/swr_ctrl_dlkm.ko b/swr_ctrl_dlkm.ko
index e69de29..d7a74c2 100644
--- a/swr_ctrl_dlkm.ko
+++ b/swr_ctrl_dlkm.ko
Binary files differ
diff --git a/swr_dlkm.ko b/swr_dlkm.ko
index e69de29..e6db9ef 100644
--- a/swr_dlkm.ko
+++ b/swr_dlkm.ko
Binary files differ
diff --git a/usf_dlkm.ko b/usf_dlkm.ko
index e69de29..2a284f9 100644
--- a/usf_dlkm.ko
+++ b/usf_dlkm.ko
Binary files differ
diff --git a/videobuf2-memops.ko b/videobuf2-memops.ko
index e69de29..ec728d6 100644
--- a/videobuf2-memops.ko
+++ b/videobuf2-memops.ko
Binary files differ
diff --git a/videobuf2-vmalloc.ko b/videobuf2-vmalloc.ko
index e69de29..7df01f5 100644
--- a/videobuf2-vmalloc.ko
+++ b/videobuf2-vmalloc.ko
Binary files differ
diff --git a/wcd934x_dlkm.ko b/wcd934x_dlkm.ko
index e69de29..c7e6232 100644
--- a/wcd934x_dlkm.ko
+++ b/wcd934x_dlkm.ko
Binary files differ
diff --git a/wcd9360_dlkm.ko b/wcd9360_dlkm.ko
index e69de29..bf58f44 100644
--- a/wcd9360_dlkm.ko
+++ b/wcd9360_dlkm.ko
Binary files differ
diff --git a/wcd9xxx_dlkm.ko b/wcd9xxx_dlkm.ko
index e69de29..dd75ea8 100644
--- a/wcd9xxx_dlkm.ko
+++ b/wcd9xxx_dlkm.ko
Binary files differ
diff --git a/wcd_core_dlkm.ko b/wcd_core_dlkm.ko
index e69de29..52a4fa9 100644
--- a/wcd_core_dlkm.ko
+++ b/wcd_core_dlkm.ko
Binary files differ
diff --git a/wcd_cpe_dlkm.ko b/wcd_cpe_dlkm.ko
index e69de29..73d256a 100644
--- a/wcd_cpe_dlkm.ko
+++ b/wcd_cpe_dlkm.ko
Binary files differ
diff --git a/wcd_spi_dlkm.ko b/wcd_spi_dlkm.ko
index e69de29..8fc7364 100644
--- a/wcd_spi_dlkm.ko
+++ b/wcd_spi_dlkm.ko
Binary files differ
diff --git a/wglink_dlkm.ko b/wglink_dlkm.ko
index e69de29..010fc33 100644
--- a/wglink_dlkm.ko
+++ b/wglink_dlkm.ko
Binary files differ
diff --git a/wlan.ko b/wlan.ko
index e69de29..fd38089 100644
--- a/wlan.ko
+++ b/wlan.ko
Binary files differ
diff --git a/wsa881x_dlkm.ko b/wsa881x_dlkm.ko
index e69de29..296f11d 100644
--- a/wsa881x_dlkm.ko
+++ b/wsa881x_dlkm.ko
Binary files differ