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 a0eecb7e1e0ceb793a16f8c63d289a12b085928b.

Reason for revert: b/177499518 - Broken build

Change-Id: I8d1ae6eda785cf2457aaed3004aaa58707a47d1d
(cherry picked from commit 7639617c7522c8c704459ffb73b13a743f4308d5)
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 418c9d2..29bf2e7 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "Image.lz4"
   }
   dest_file: "Image.lz4"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 ee2a1dd..92de72c 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "adsp_loader_dlkm.ko"
   }
   dest_file: "adsp_loader_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 9a0c1ab..472849a 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "apr_dlkm.ko"
   }
   dest_file: "apr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_asn1_decoder_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_asn1_decoder_ko.asciipb
index 6d6e0a9..9ea7020 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_asn1_decoder_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_asn1_decoder_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "asn1_decoder.ko"
   }
   dest_file: "asn1_decoder.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_bolero_cdc_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_bolero_cdc_dlkm_ko.asciipb
index e4a651b..7dbca4d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_bolero_cdc_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_bolero_cdc_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "bolero_cdc_dlkm.ko"
   }
   dest_file: "bolero_cdc_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_br_netfilter_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_br_netfilter_ko.asciipb
index 8862892..c8874a4 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_br_netfilter_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_br_netfilter_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "br_netfilter.ko"
   }
   dest_file: "br_netfilter.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 f15f658..298b890 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "Image.lz4"
   }
   dest_file: "debug_api/Image.lz4"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 8e8b77d..5554e71 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "adsp_loader_dlkm.ko"
   }
   dest_file: "debug_api/adsp_loader_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 ab57af6..c457798 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "apr_dlkm.ko"
   }
   dest_file: "debug_api/apr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_asn1_decoder_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_asn1_decoder_ko.asciipb
index f4b4770..14d121f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_asn1_decoder_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_asn1_decoder_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "asn1_decoder.ko"
   }
   dest_file: "debug_api/asn1_decoder.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_bolero_cdc_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_bolero_cdc_dlkm_ko.asciipb
index 7291534..5ebb8b5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_bolero_cdc_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_bolero_cdc_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "bolero_cdc_dlkm.ko"
   }
   dest_file: "debug_api/bolero_cdc_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_br_netfilter_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_br_netfilter_ko.asciipb
index a5e6bdb..52a92e3 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_br_netfilter_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_br_netfilter_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "br_netfilter.ko"
   }
   dest_file: "debug_api/br_netfilter.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_drv2624_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_drv2624_ko.asciipb
index 6b446ed..f8f709c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_drv2624_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_drv2624_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "drv2624.ko"
   }
   dest_file: "debug_api/drv2624.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 00d2677..2a2ab94 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "dtbo.img"
   }
   dest_file: "debug_api/dtbo.img"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 bdde151..15b3c43 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "ftm5.ko"
   }
   dest_file: "debug_api/ftm5.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_gspca_main_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_gspca_main_ko.asciipb
index d54bab8..77b3d54 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_gspca_main_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_gspca_main_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "gspca_main.ko"
   }
   dest_file: "debug_api/gspca_main.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_hdmi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_hdmi_dlkm_ko.asciipb
index ab759f5..0e1be2e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_hdmi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_hdmi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "hdmi_dlkm.ko"
   }
   dest_file: "debug_api/hdmi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 f1fd935..54208e2 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "heatmap.ko"
   }
   dest_file: "debug_api/heatmap.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 41998b1..56f2031 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "incrementalfs.ko"
   }
   dest_file: "debug_api/incrementalfs.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_lcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_lcd_ko.asciipb
index 72958c7..6d48be6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_lcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_lcd_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "lcd.ko"
   }
   dest_file: "debug_api/lcd.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_llcc_perfmon_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_llcc_perfmon_ko.asciipb
index 30db014..a8ef129 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_llcc_perfmon_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_llcc_perfmon_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "llcc_perfmon.ko"
   }
   dest_file: "debug_api/llcc_perfmon.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 001e02a..3fe806d 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "machine_dlkm.ko"
   }
   dest_file: "debug_api/machine_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 7aaa179..ed2a9d0 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "mbhc_dlkm.ko"
   }
   dest_file: "debug_api/mbhc_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_mpi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_mpi_ko.asciipb
index f569972..6c00df4 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_mpi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_mpi_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "mpi.ko"
   }
   dest_file: "debug_api/mpi.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_mpq-adapter_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_mpq-adapter_ko.asciipb
index d429839..9bf3051 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_mpq-adapter_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_mpq-adapter_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "mpq-adapter.ko"
   }
   dest_file: "debug_api/mpq-adapter.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_mpq-dmx-hw-plugin_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_mpq-dmx-hw-plugin_ko.asciipb
index 99d9752..db597b3 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_mpq-dmx-hw-plugin_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_mpq-dmx-hw-plugin_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "mpq-dmx-hw-plugin.ko"
   }
   dest_file: "debug_api/mpq-dmx-hw-plugin.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_msm-geni-ir_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_msm-geni-ir_ko.asciipb
index a20613b..0465c6a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_msm-geni-ir_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_msm-geni-ir_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "msm-geni-ir.ko"
   }
   dest_file: "debug_api/msm-geni-ir.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 c5cab86..ce9a46f 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "msm_11ad_proxy.ko"
   }
   dest_file: "debug_api/msm_11ad_proxy.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 9e96a10..41c2b60 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "native_dlkm.ko"
   }
   dest_file: "debug_api/native_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_oid_registry_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_oid_registry_ko.asciipb
index 858cd3c..ce7c34f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_oid_registry_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_oid_registry_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "oid_registry.ko"
   }
   dest_file: "debug_api/oid_registry.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_pinctrl_lpi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_pinctrl_lpi_dlkm_ko.asciipb
index f4d0e9e..264ca26 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_pinctrl_lpi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_pinctrl_lpi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "pinctrl_lpi_dlkm.ko"
   }
   dest_file: "debug_api/pinctrl_lpi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 203db5f..5d4ba57 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "pinctrl_wcd_dlkm.ko"
   }
   dest_file: "debug_api/pinctrl_wcd_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 1acd1e8..d015bb9 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "platform_dlkm.ko"
   }
   dest_file: "debug_api/platform_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_public_key_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_public_key_ko.asciipb
index b4a312b..2672693 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_public_key_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_public_key_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "public_key.ko"
   }
   dest_file: "debug_api/public_key.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 995027d..32080b1 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "q6_dlkm.ko"
   }
   dest_file: "debug_api/q6_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 55348a2..4e3ddb1 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "q6_notifier_dlkm.ko"
   }
   dest_file: "debug_api/q6_notifier_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 881c907..506a3df 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "q6_pdr_dlkm.ko"
   }
   dest_file: "debug_api/q6_pdr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_rdbg_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_rdbg_ko.asciipb
index cab3bc3..1da135f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_rdbg_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_rdbg_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "rdbg.ko"
   }
   dest_file: "debug_api/rdbg.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_rsa_generic_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_rsa_generic_ko.asciipb
index ce5baf8..1b3a5fa 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_rsa_generic_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_rsa_generic_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "rsa_generic.ko"
   }
   dest_file: "debug_api/rsa_generic.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_rx_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_rx_macro_dlkm_ko.asciipb
index 2e98f3c..b69c7bd 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_rx_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_rx_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "rx_macro_dlkm.ko"
   }
   dest_file: "debug_api/rx_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdmmagpie_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdmmagpie_dtb.asciipb
index 78868b5..921648e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdmmagpie_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdmmagpie_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "sdmmagpie.dtb"
   }
   dest_file: "debug_api/sdmmagpie.dtb"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd_event_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd_event_dlkm_ko.asciipb
index 1f0a494..7d75a81 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd_event_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd_event_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "snd_event_dlkm.ko"
   }
   dest_file: "debug_api/snd_event_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 913ace6..74ab8ac 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "stub_dlkm.ko"
   }
   dest_file: "debug_api/stub_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 8520132..56db5f0 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "swr_ctrl_dlkm.ko"
   }
   dest_file: "debug_api/swr_ctrl_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 4b502fd..f5aee2e 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "swr_dlkm.ko"
   }
   dest_file: "debug_api/swr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_tx_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_tx_macro_dlkm_ko.asciipb
index adbaa2e..ab6cde2 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_tx_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_tx_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "tx_macro_dlkm.ko"
   }
   dest_file: "debug_api/tx_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 84915c3..90e0039 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "usf_dlkm.ko"
   }
   dest_file: "debug_api/usf_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_va_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_va_macro_dlkm_ko.asciipb
index 2781cf4..32b5b16 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_va_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_va_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "va_macro_dlkm.ko"
   }
   dest_file: "debug_api/va_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 b0684e7..9743fb8 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "wcd934x_dlkm.ko"
   }
   dest_file: "debug_api/wcd934x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd937x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd937x_dlkm_ko.asciipb
index c37f2b0..c6dadde 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd937x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd937x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "wcd937x_dlkm.ko"
   }
   dest_file: "debug_api/wcd937x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd937x_slave_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd937x_slave_dlkm_ko.asciipb
index 63479d2..40565f8 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd937x_slave_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd937x_slave_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "wcd937x_slave_dlkm.ko"
   }
   dest_file: "debug_api/wcd937x_slave_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 6fe260d..78d7eb0 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "wcd9xxx_dlkm.ko"
   }
   dest_file: "debug_api/wcd9xxx_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 adb73ca..0969c15 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "wcd_core_dlkm.ko"
   }
   dest_file: "debug_api/wcd_core_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 2a4a197..27fb7ef 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "wcd_spi_dlkm.ko"
   }
   dest_file: "debug_api/wcd_spi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 6c7dd25..03c2a1d 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "wglink_dlkm.ko"
   }
   dest_file: "debug_api/wglink_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 fe48324..b93fe01 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "wlan.ko"
   }
   dest_file: "debug_api/wlan.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 6ce9ffa..3e27e43 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "wsa881x_dlkm.ko"
   }
   dest_file: "debug_api/wsa881x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wsa_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wsa_macro_dlkm_ko.asciipb
index bb8af1c..31790e2 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wsa_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wsa_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "wsa_macro_dlkm.ko"
   }
   dest_file: "debug_api/wsa_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_x509_key_parser_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_x509_key_parser_ko.asciipb
index 18fc011..6a45b86 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_x509_key_parser_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_x509_key_parser_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_api"
     source_file: "x509_key_parser.ko"
   }
   dest_file: "debug_api/x509_key_parser.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 8ad24c1..7297080 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "Image.lz4"
   }
   dest_file: "debug_hang/Image.lz4"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 1a3b762..250e43f 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "adsp_loader_dlkm.ko"
   }
   dest_file: "debug_hang/adsp_loader_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 54c1cb9..f8736d4 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "apr_dlkm.ko"
   }
   dest_file: "debug_hang/apr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_asn1_decoder_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_asn1_decoder_ko.asciipb
index 3468831..7f2ad7e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_asn1_decoder_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_asn1_decoder_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "asn1_decoder.ko"
   }
   dest_file: "debug_hang/asn1_decoder.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_bolero_cdc_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_bolero_cdc_dlkm_ko.asciipb
index c0bb6de..f98a542 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_bolero_cdc_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_bolero_cdc_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "bolero_cdc_dlkm.ko"
   }
   dest_file: "debug_hang/bolero_cdc_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_br_netfilter_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_br_netfilter_ko.asciipb
index 242c61a..f55d919 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_br_netfilter_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_br_netfilter_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "br_netfilter.ko"
   }
   dest_file: "debug_hang/br_netfilter.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_drv2624_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_drv2624_ko.asciipb
index ef8941d..ae66207 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_drv2624_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_drv2624_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "drv2624.ko"
   }
   dest_file: "debug_hang/drv2624.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 c0b8c70..d90731a 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "dtbo.img"
   }
   dest_file: "debug_hang/dtbo.img"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 91b7b24..6b40324 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "ftm5.ko"
   }
   dest_file: "debug_hang/ftm5.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_gspca_main_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_gspca_main_ko.asciipb
index 6bbe35e..11028b6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_gspca_main_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_gspca_main_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "gspca_main.ko"
   }
   dest_file: "debug_hang/gspca_main.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_hdmi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_hdmi_dlkm_ko.asciipb
index 944ed87..7b74c21 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_hdmi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_hdmi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "hdmi_dlkm.ko"
   }
   dest_file: "debug_hang/hdmi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 a1b06d5..e550e83 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "heatmap.ko"
   }
   dest_file: "debug_hang/heatmap.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 4833d0b..3f8e8b2 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "incrementalfs.ko"
   }
   dest_file: "debug_hang/incrementalfs.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_lcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_lcd_ko.asciipb
index c1889ed..db1da96 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_lcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_lcd_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "lcd.ko"
   }
   dest_file: "debug_hang/lcd.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_llcc_perfmon_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_llcc_perfmon_ko.asciipb
index a03a24c..462efd0 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_llcc_perfmon_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_llcc_perfmon_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "llcc_perfmon.ko"
   }
   dest_file: "debug_hang/llcc_perfmon.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 942f670..0bbcade 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "machine_dlkm.ko"
   }
   dest_file: "debug_hang/machine_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 c9e192b..cf87ae8 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "mbhc_dlkm.ko"
   }
   dest_file: "debug_hang/mbhc_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_mpi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_mpi_ko.asciipb
index 39326f5..1def0fd 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_mpi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_mpi_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "mpi.ko"
   }
   dest_file: "debug_hang/mpi.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_mpq-adapter_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_mpq-adapter_ko.asciipb
index b768fcd..9e95b04 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_mpq-adapter_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_mpq-adapter_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "mpq-adapter.ko"
   }
   dest_file: "debug_hang/mpq-adapter.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_mpq-dmx-hw-plugin_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_mpq-dmx-hw-plugin_ko.asciipb
index 3c8771b..d345366 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_mpq-dmx-hw-plugin_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_mpq-dmx-hw-plugin_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "mpq-dmx-hw-plugin.ko"
   }
   dest_file: "debug_hang/mpq-dmx-hw-plugin.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_msm-geni-ir_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_msm-geni-ir_ko.asciipb
index e2f4728..cb24eb6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_msm-geni-ir_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_msm-geni-ir_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "msm-geni-ir.ko"
   }
   dest_file: "debug_hang/msm-geni-ir.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 c8f53fb..92b18ee 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "msm_11ad_proxy.ko"
   }
   dest_file: "debug_hang/msm_11ad_proxy.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 fb6dd0d..c55101f 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "native_dlkm.ko"
   }
   dest_file: "debug_hang/native_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_oid_registry_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_oid_registry_ko.asciipb
index 3e4fad5..1064ce1 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_oid_registry_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_oid_registry_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "oid_registry.ko"
   }
   dest_file: "debug_hang/oid_registry.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_pinctrl_lpi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_pinctrl_lpi_dlkm_ko.asciipb
index 8476020..a4fc614 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_pinctrl_lpi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_pinctrl_lpi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "pinctrl_lpi_dlkm.ko"
   }
   dest_file: "debug_hang/pinctrl_lpi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 85718db..8b9fccf 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "pinctrl_wcd_dlkm.ko"
   }
   dest_file: "debug_hang/pinctrl_wcd_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 ef8d59a..a10b8b8 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "platform_dlkm.ko"
   }
   dest_file: "debug_hang/platform_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_public_key_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_public_key_ko.asciipb
index 080cd21..9d9b55d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_public_key_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_public_key_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "public_key.ko"
   }
   dest_file: "debug_hang/public_key.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 419bb69..76c5810 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "q6_dlkm.ko"
   }
   dest_file: "debug_hang/q6_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 9f03c4c..f0efa3f 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "q6_notifier_dlkm.ko"
   }
   dest_file: "debug_hang/q6_notifier_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 2ba8f69..adc0be2 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "q6_pdr_dlkm.ko"
   }
   dest_file: "debug_hang/q6_pdr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_rdbg_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_rdbg_ko.asciipb
index e761043..092b21a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_rdbg_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_rdbg_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "rdbg.ko"
   }
   dest_file: "debug_hang/rdbg.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_rsa_generic_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_rsa_generic_ko.asciipb
index a14b29b..7441b06 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_rsa_generic_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_rsa_generic_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "rsa_generic.ko"
   }
   dest_file: "debug_hang/rsa_generic.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_rx_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_rx_macro_dlkm_ko.asciipb
index bc22d80..b2e3948 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_rx_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_rx_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "rx_macro_dlkm.ko"
   }
   dest_file: "debug_hang/rx_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdmmagpie_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdmmagpie_dtb.asciipb
index 8d6ab26..75396ff 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdmmagpie_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdmmagpie_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "sdmmagpie.dtb"
   }
   dest_file: "debug_hang/sdmmagpie.dtb"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd_event_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd_event_dlkm_ko.asciipb
index 1ff7645..c67420c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd_event_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd_event_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "snd_event_dlkm.ko"
   }
   dest_file: "debug_hang/snd_event_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 2c831bd..932fefd 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "stub_dlkm.ko"
   }
   dest_file: "debug_hang/stub_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 c7a19ff..9c6c4bc 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "swr_ctrl_dlkm.ko"
   }
   dest_file: "debug_hang/swr_ctrl_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 f2741ff..eb33d83 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "swr_dlkm.ko"
   }
   dest_file: "debug_hang/swr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_tx_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_tx_macro_dlkm_ko.asciipb
index 2f92467..f152f9f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_tx_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_tx_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "tx_macro_dlkm.ko"
   }
   dest_file: "debug_hang/tx_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 53fa6d6..14437b5 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "usf_dlkm.ko"
   }
   dest_file: "debug_hang/usf_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_va_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_va_macro_dlkm_ko.asciipb
index 2b8a68e..bfb9320 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_va_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_va_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "va_macro_dlkm.ko"
   }
   dest_file: "debug_hang/va_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 8a76f51..af264a3 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "wcd934x_dlkm.ko"
   }
   dest_file: "debug_hang/wcd934x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd937x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd937x_dlkm_ko.asciipb
index 0626adc..1eadcd8 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd937x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd937x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "wcd937x_dlkm.ko"
   }
   dest_file: "debug_hang/wcd937x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd937x_slave_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd937x_slave_dlkm_ko.asciipb
index 5284382..aa671de 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd937x_slave_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd937x_slave_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "wcd937x_slave_dlkm.ko"
   }
   dest_file: "debug_hang/wcd937x_slave_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 4d866b6..8b7db38 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "wcd9xxx_dlkm.ko"
   }
   dest_file: "debug_hang/wcd9xxx_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 92f96ee..23129c1 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "wcd_core_dlkm.ko"
   }
   dest_file: "debug_hang/wcd_core_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 1d6b060..4b9e5f9 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "wcd_spi_dlkm.ko"
   }
   dest_file: "debug_hang/wcd_spi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 61b2eff..8fdcc5a 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "wglink_dlkm.ko"
   }
   dest_file: "debug_hang/wglink_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 d081f62..6b33a6e 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "wlan.ko"
   }
   dest_file: "debug_hang/wlan.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 4e6bd05..0f3a94e 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "wsa881x_dlkm.ko"
   }
   dest_file: "debug_hang/wsa881x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wsa_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wsa_macro_dlkm_ko.asciipb
index 5a59d90..c34d589 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wsa_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wsa_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "wsa_macro_dlkm.ko"
   }
   dest_file: "debug_hang/wsa_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_x509_key_parser_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_x509_key_parser_ko.asciipb
index 9e87333..cb3cdd9 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_x509_key_parser_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_x509_key_parser_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_hang"
     source_file: "x509_key_parser.ko"
   }
   dest_file: "debug_hang/x509_key_parser.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 efd852e..eab6fde 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "Image.lz4"
   }
   dest_file: "debug_locking/Image.lz4"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 756e396..c3e3c84 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "adsp_loader_dlkm.ko"
   }
   dest_file: "debug_locking/adsp_loader_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 5e4aabc..6064726 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "apr_dlkm.ko"
   }
   dest_file: "debug_locking/apr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_asn1_decoder_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_asn1_decoder_ko.asciipb
index 6c5ab79..993f074 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_asn1_decoder_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_asn1_decoder_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "asn1_decoder.ko"
   }
   dest_file: "debug_locking/asn1_decoder.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_bolero_cdc_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_bolero_cdc_dlkm_ko.asciipb
index 06e29f3..23fd0db 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_bolero_cdc_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_bolero_cdc_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "bolero_cdc_dlkm.ko"
   }
   dest_file: "debug_locking/bolero_cdc_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_br_netfilter_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_br_netfilter_ko.asciipb
index de11c85..793dba2 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_br_netfilter_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_br_netfilter_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "br_netfilter.ko"
   }
   dest_file: "debug_locking/br_netfilter.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_drv2624_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_drv2624_ko.asciipb
index 6b98df8..64b5ae3 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_drv2624_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_drv2624_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "drv2624.ko"
   }
   dest_file: "debug_locking/drv2624.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 7242f0c..247de09 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "dtbo.img"
   }
   dest_file: "debug_locking/dtbo.img"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 b47451f..33822e9 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "ftm5.ko"
   }
   dest_file: "debug_locking/ftm5.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_gspca_main_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_gspca_main_ko.asciipb
index cc2e049..65d2f24 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_gspca_main_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_gspca_main_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "gspca_main.ko"
   }
   dest_file: "debug_locking/gspca_main.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_hdmi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_hdmi_dlkm_ko.asciipb
index 0fe16cf..4f7cdcb 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_hdmi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_hdmi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "hdmi_dlkm.ko"
   }
   dest_file: "debug_locking/hdmi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 4f8b5dd..e87de8b 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "heatmap.ko"
   }
   dest_file: "debug_locking/heatmap.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 70036de..b3517d7 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "incrementalfs.ko"
   }
   dest_file: "debug_locking/incrementalfs.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_lcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_lcd_ko.asciipb
index d570406..9c2e4b4 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_lcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_lcd_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "lcd.ko"
   }
   dest_file: "debug_locking/lcd.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_llcc_perfmon_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_llcc_perfmon_ko.asciipb
index 4473304..ed595e3 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_llcc_perfmon_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_llcc_perfmon_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "llcc_perfmon.ko"
   }
   dest_file: "debug_locking/llcc_perfmon.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 49265ee..a58f14d 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "machine_dlkm.ko"
   }
   dest_file: "debug_locking/machine_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 f11cdfb..42cb8d5 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "mbhc_dlkm.ko"
   }
   dest_file: "debug_locking/mbhc_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_mpi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_mpi_ko.asciipb
index 1a4f636..c176db4 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_mpi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_mpi_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "mpi.ko"
   }
   dest_file: "debug_locking/mpi.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_mpq-adapter_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_mpq-adapter_ko.asciipb
index 79cf2d2..4bdc4fb 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_mpq-adapter_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_mpq-adapter_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "mpq-adapter.ko"
   }
   dest_file: "debug_locking/mpq-adapter.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_mpq-dmx-hw-plugin_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_mpq-dmx-hw-plugin_ko.asciipb
index cb20ed2..59102d7 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_mpq-dmx-hw-plugin_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_mpq-dmx-hw-plugin_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "mpq-dmx-hw-plugin.ko"
   }
   dest_file: "debug_locking/mpq-dmx-hw-plugin.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_msm-geni-ir_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_msm-geni-ir_ko.asciipb
index 3d7f95b..a3ef8e6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_msm-geni-ir_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_msm-geni-ir_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "msm-geni-ir.ko"
   }
   dest_file: "debug_locking/msm-geni-ir.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 cddf6e9..0027710 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "msm_11ad_proxy.ko"
   }
   dest_file: "debug_locking/msm_11ad_proxy.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 f2fbf59..26b7595 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "native_dlkm.ko"
   }
   dest_file: "debug_locking/native_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_oid_registry_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_oid_registry_ko.asciipb
index 47a20a2..c8e5c0c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_oid_registry_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_oid_registry_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "oid_registry.ko"
   }
   dest_file: "debug_locking/oid_registry.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_pinctrl_lpi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_pinctrl_lpi_dlkm_ko.asciipb
index 0d37e47..841f48a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_pinctrl_lpi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_pinctrl_lpi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "pinctrl_lpi_dlkm.ko"
   }
   dest_file: "debug_locking/pinctrl_lpi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 11738d6..6876773 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "pinctrl_wcd_dlkm.ko"
   }
   dest_file: "debug_locking/pinctrl_wcd_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 4a25e73..698c765 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "platform_dlkm.ko"
   }
   dest_file: "debug_locking/platform_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_public_key_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_public_key_ko.asciipb
index 5dcff2e..5955ae8 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_public_key_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_public_key_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "public_key.ko"
   }
   dest_file: "debug_locking/public_key.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 2cfe4e0..af4d6f8 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "q6_dlkm.ko"
   }
   dest_file: "debug_locking/q6_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 d16b979..e94b7d0 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "q6_notifier_dlkm.ko"
   }
   dest_file: "debug_locking/q6_notifier_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 6b5897d..9570c0c 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "q6_pdr_dlkm.ko"
   }
   dest_file: "debug_locking/q6_pdr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_rdbg_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_rdbg_ko.asciipb
index 95861c5..25ad287 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_rdbg_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_rdbg_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "rdbg.ko"
   }
   dest_file: "debug_locking/rdbg.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_rsa_generic_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_rsa_generic_ko.asciipb
index bfdcd53..ec946cc 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_rsa_generic_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_rsa_generic_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "rsa_generic.ko"
   }
   dest_file: "debug_locking/rsa_generic.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_rx_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_rx_macro_dlkm_ko.asciipb
index 81ee8c5..cc31f33 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_rx_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_rx_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "rx_macro_dlkm.ko"
   }
   dest_file: "debug_locking/rx_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdmmagpie_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdmmagpie_dtb.asciipb
index 4495861..2167817 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdmmagpie_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdmmagpie_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "sdmmagpie.dtb"
   }
   dest_file: "debug_locking/sdmmagpie.dtb"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd_event_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd_event_dlkm_ko.asciipb
index df030aa..09eda22 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd_event_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd_event_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "snd_event_dlkm.ko"
   }
   dest_file: "debug_locking/snd_event_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 07f0ad7..e12d69a 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "stub_dlkm.ko"
   }
   dest_file: "debug_locking/stub_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 29c6c50..4ea34aa 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "swr_ctrl_dlkm.ko"
   }
   dest_file: "debug_locking/swr_ctrl_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 215e7c7..95ca8ef 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "swr_dlkm.ko"
   }
   dest_file: "debug_locking/swr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_tx_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_tx_macro_dlkm_ko.asciipb
index 72ae22e..771fd9b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_tx_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_tx_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "tx_macro_dlkm.ko"
   }
   dest_file: "debug_locking/tx_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 73d024c..b093e92 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "usf_dlkm.ko"
   }
   dest_file: "debug_locking/usf_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_va_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_va_macro_dlkm_ko.asciipb
index 510e5ad..0b23206 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_va_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_va_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "va_macro_dlkm.ko"
   }
   dest_file: "debug_locking/va_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 7f063b0..416a4a5 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "wcd934x_dlkm.ko"
   }
   dest_file: "debug_locking/wcd934x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd937x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd937x_dlkm_ko.asciipb
index 1974a77..f425d55 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd937x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd937x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "wcd937x_dlkm.ko"
   }
   dest_file: "debug_locking/wcd937x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd937x_slave_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd937x_slave_dlkm_ko.asciipb
index 5fb358f..d4759aa 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd937x_slave_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd937x_slave_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "wcd937x_slave_dlkm.ko"
   }
   dest_file: "debug_locking/wcd937x_slave_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 c1e2757..2076502 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "wcd9xxx_dlkm.ko"
   }
   dest_file: "debug_locking/wcd9xxx_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 df51dd0..eaa295c 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "wcd_core_dlkm.ko"
   }
   dest_file: "debug_locking/wcd_core_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 8a19f22..d420168 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "wcd_spi_dlkm.ko"
   }
   dest_file: "debug_locking/wcd_spi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 cbba54e..c68f0e9 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "wglink_dlkm.ko"
   }
   dest_file: "debug_locking/wglink_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 e722794..d44f58f 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "wlan.ko"
   }
   dest_file: "debug_locking/wlan.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 0543b8e..3d1c441 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "wsa881x_dlkm.ko"
   }
   dest_file: "debug_locking/wsa881x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wsa_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wsa_macro_dlkm_ko.asciipb
index 7e166ae..a2429c9 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wsa_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wsa_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "wsa_macro_dlkm.ko"
   }
   dest_file: "debug_locking/wsa_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_x509_key_parser_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_x509_key_parser_ko.asciipb
index f14e543..159255a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_x509_key_parser_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_x509_key_parser_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_locking"
     source_file: "x509_key_parser.ko"
   }
   dest_file: "debug_locking/x509_key_parser.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 b869c31..7a24833 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "Image.lz4"
   }
   dest_file: "debug_memory/Image.lz4"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 ea6b374..4a4e08c 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "adsp_loader_dlkm.ko"
   }
   dest_file: "debug_memory/adsp_loader_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 6b877d5..c4c8e3a 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "apr_dlkm.ko"
   }
   dest_file: "debug_memory/apr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_asn1_decoder_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_asn1_decoder_ko.asciipb
index dfb54d7..612713b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_asn1_decoder_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_asn1_decoder_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "asn1_decoder.ko"
   }
   dest_file: "debug_memory/asn1_decoder.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_bolero_cdc_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_bolero_cdc_dlkm_ko.asciipb
index 139e12c..74c44a3 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_bolero_cdc_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_bolero_cdc_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "bolero_cdc_dlkm.ko"
   }
   dest_file: "debug_memory/bolero_cdc_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_br_netfilter_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_br_netfilter_ko.asciipb
index c3bda31..5024b62 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_br_netfilter_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_br_netfilter_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "br_netfilter.ko"
   }
   dest_file: "debug_memory/br_netfilter.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_drv2624_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_drv2624_ko.asciipb
index aff6bdc..fefb05f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_drv2624_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_drv2624_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "drv2624.ko"
   }
   dest_file: "debug_memory/drv2624.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 1fc2bad..1a0bed6 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "dtbo.img"
   }
   dest_file: "debug_memory/dtbo.img"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 5749752..8dcb3ba 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "ftm5.ko"
   }
   dest_file: "debug_memory/ftm5.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_gspca_main_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_gspca_main_ko.asciipb
index a179e2d..ee0245d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_gspca_main_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_gspca_main_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "gspca_main.ko"
   }
   dest_file: "debug_memory/gspca_main.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_hdmi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_hdmi_dlkm_ko.asciipb
index 69158b4..d977f28 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_hdmi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_hdmi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "hdmi_dlkm.ko"
   }
   dest_file: "debug_memory/hdmi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 66046f7..d56df62 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "heatmap.ko"
   }
   dest_file: "debug_memory/heatmap.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 0da42ae..6bfa7c0 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "incrementalfs.ko"
   }
   dest_file: "debug_memory/incrementalfs.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_lcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_lcd_ko.asciipb
index 41f4b2a..3880fa6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_lcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_lcd_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "lcd.ko"
   }
   dest_file: "debug_memory/lcd.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_llcc_perfmon_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_llcc_perfmon_ko.asciipb
index 31f283c..f80a4d7 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_llcc_perfmon_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_llcc_perfmon_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "llcc_perfmon.ko"
   }
   dest_file: "debug_memory/llcc_perfmon.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 9d28200..32b5224 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "machine_dlkm.ko"
   }
   dest_file: "debug_memory/machine_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 54bf90c..bee530f 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "mbhc_dlkm.ko"
   }
   dest_file: "debug_memory/mbhc_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_mpi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_mpi_ko.asciipb
index 437f9bc..e489087 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_mpi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_mpi_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "mpi.ko"
   }
   dest_file: "debug_memory/mpi.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_mpq-adapter_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_mpq-adapter_ko.asciipb
index 4722223..a5a7389 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_mpq-adapter_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_mpq-adapter_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "mpq-adapter.ko"
   }
   dest_file: "debug_memory/mpq-adapter.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_mpq-dmx-hw-plugin_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_mpq-dmx-hw-plugin_ko.asciipb
index 68a994e..54b097c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_mpq-dmx-hw-plugin_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_mpq-dmx-hw-plugin_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "mpq-dmx-hw-plugin.ko"
   }
   dest_file: "debug_memory/mpq-dmx-hw-plugin.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_msm-geni-ir_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_msm-geni-ir_ko.asciipb
index 454f8d9..e281b6c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_msm-geni-ir_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_msm-geni-ir_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "msm-geni-ir.ko"
   }
   dest_file: "debug_memory/msm-geni-ir.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 b1f1736..175ec30 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "msm_11ad_proxy.ko"
   }
   dest_file: "debug_memory/msm_11ad_proxy.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 a1f2378..b3012f1 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "native_dlkm.ko"
   }
   dest_file: "debug_memory/native_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_oid_registry_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_oid_registry_ko.asciipb
index 73715f0..1bd7fa7 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_oid_registry_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_oid_registry_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "oid_registry.ko"
   }
   dest_file: "debug_memory/oid_registry.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_pinctrl_lpi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_pinctrl_lpi_dlkm_ko.asciipb
index a40cb8b..2777510 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_pinctrl_lpi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_pinctrl_lpi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "pinctrl_lpi_dlkm.ko"
   }
   dest_file: "debug_memory/pinctrl_lpi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 83b24d5..1ed5071 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "pinctrl_wcd_dlkm.ko"
   }
   dest_file: "debug_memory/pinctrl_wcd_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 ac4c223..9b01ad2 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "platform_dlkm.ko"
   }
   dest_file: "debug_memory/platform_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_public_key_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_public_key_ko.asciipb
index cfdd588..3fdf467 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_public_key_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_public_key_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "public_key.ko"
   }
   dest_file: "debug_memory/public_key.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 722662f..615b7be 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "q6_dlkm.ko"
   }
   dest_file: "debug_memory/q6_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 49c5537..ebdf5c7 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "q6_notifier_dlkm.ko"
   }
   dest_file: "debug_memory/q6_notifier_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 3b6b1de..b62d1fc 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "q6_pdr_dlkm.ko"
   }
   dest_file: "debug_memory/q6_pdr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_rdbg_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_rdbg_ko.asciipb
index 2188424..55f7db5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_rdbg_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_rdbg_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "rdbg.ko"
   }
   dest_file: "debug_memory/rdbg.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_rsa_generic_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_rsa_generic_ko.asciipb
index d18a4cd..381cae1 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_rsa_generic_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_rsa_generic_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "rsa_generic.ko"
   }
   dest_file: "debug_memory/rsa_generic.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_rx_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_rx_macro_dlkm_ko.asciipb
index ba5ac56..9d91e62 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_rx_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_rx_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "rx_macro_dlkm.ko"
   }
   dest_file: "debug_memory/rx_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdmmagpie_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdmmagpie_dtb.asciipb
index cfd7511..ce1d8a6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdmmagpie_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdmmagpie_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "sdmmagpie.dtb"
   }
   dest_file: "debug_memory/sdmmagpie.dtb"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd_event_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd_event_dlkm_ko.asciipb
index e6ac3e0..f15b25a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd_event_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd_event_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "snd_event_dlkm.ko"
   }
   dest_file: "debug_memory/snd_event_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 5618bd0..c259aa2 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "stub_dlkm.ko"
   }
   dest_file: "debug_memory/stub_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 6097db0..69ac95d 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "swr_ctrl_dlkm.ko"
   }
   dest_file: "debug_memory/swr_ctrl_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 527c994..229694c 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "swr_dlkm.ko"
   }
   dest_file: "debug_memory/swr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_tx_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_tx_macro_dlkm_ko.asciipb
index bb5c3e6..b03dd5b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_tx_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_tx_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "tx_macro_dlkm.ko"
   }
   dest_file: "debug_memory/tx_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 8bc3f14..c2fc95e 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "usf_dlkm.ko"
   }
   dest_file: "debug_memory/usf_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_va_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_va_macro_dlkm_ko.asciipb
index cf77a98..86d8b25 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_va_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_va_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "va_macro_dlkm.ko"
   }
   dest_file: "debug_memory/va_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 b58376c..e3f3e35 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "wcd934x_dlkm.ko"
   }
   dest_file: "debug_memory/wcd934x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd937x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd937x_dlkm_ko.asciipb
index c1627d9..c13055f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd937x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd937x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "wcd937x_dlkm.ko"
   }
   dest_file: "debug_memory/wcd937x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd937x_slave_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd937x_slave_dlkm_ko.asciipb
index 4663884..b8309ab 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd937x_slave_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd937x_slave_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "wcd937x_slave_dlkm.ko"
   }
   dest_file: "debug_memory/wcd937x_slave_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 a13880f..7050a9c 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "wcd9xxx_dlkm.ko"
   }
   dest_file: "debug_memory/wcd9xxx_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 b9b11b7..344ea4e 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "wcd_core_dlkm.ko"
   }
   dest_file: "debug_memory/wcd_core_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 7369b34..5f1cd1c 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "wcd_spi_dlkm.ko"
   }
   dest_file: "debug_memory/wcd_spi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 f8e1a8e..879862b 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "wglink_dlkm.ko"
   }
   dest_file: "debug_memory/wglink_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 1d5862b..05c53ff 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "wlan.ko"
   }
   dest_file: "debug_memory/wlan.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 f3c6e37..562a6a1 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "wsa881x_dlkm.ko"
   }
   dest_file: "debug_memory/wsa881x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wsa_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wsa_macro_dlkm_ko.asciipb
index b71d8c6..4444850 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wsa_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wsa_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "wsa_macro_dlkm.ko"
   }
   dest_file: "debug_memory/wsa_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_x509_key_parser_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_x509_key_parser_ko.asciipb
index 67f80a6..fddc2c6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_x509_key_parser_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_x509_key_parser_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_debug_memory"
     source_file: "x509_key_parser.ko"
   }
   dest_file: "debug_memory/x509_key_parser.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_drv2624_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_drv2624_ko.asciipb
index 5ed9360..0dea348 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_drv2624_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_drv2624_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "drv2624.ko"
   }
   dest_file: "drv2624.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 5f791e7..bfbdb3f 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "dtbo.img"
   }
   dest_file: "dtbo.img"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 d7c4308..e72294c 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "ftm5.ko"
   }
   dest_file: "ftm5.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_gspca_main_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_gspca_main_ko.asciipb
index f5128ab..40a86d0 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_gspca_main_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_gspca_main_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "gspca_main.ko"
   }
   dest_file: "gspca_main.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_hdmi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_hdmi_dlkm_ko.asciipb
index fd4e211..19d8907 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_hdmi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_hdmi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "hdmi_dlkm.ko"
   }
   dest_file: "hdmi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 48bfec0..9494083 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "heatmap.ko"
   }
   dest_file: "heatmap.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 bddc3a3..c5528bd 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "incrementalfs.ko"
   }
   dest_file: "incrementalfs.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 893dc01..e08796d 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "Image.lz4"
   }
   dest_file: "kasan/Image.lz4"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 e40362f..5238e19 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "adsp_loader_dlkm.ko"
   }
   dest_file: "kasan/adsp_loader_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 e2e2250..95789f9 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "apr_dlkm.ko"
   }
   dest_file: "kasan/apr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_asn1_decoder_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_asn1_decoder_ko.asciipb
index 26047e5..d17cf00 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_asn1_decoder_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_asn1_decoder_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "asn1_decoder.ko"
   }
   dest_file: "kasan/asn1_decoder.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_bolero_cdc_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_bolero_cdc_dlkm_ko.asciipb
index 29f2486..05db512 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_bolero_cdc_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_bolero_cdc_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "bolero_cdc_dlkm.ko"
   }
   dest_file: "kasan/bolero_cdc_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_br_netfilter_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_br_netfilter_ko.asciipb
index 52b1854..6fcb4e4 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_br_netfilter_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_br_netfilter_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "br_netfilter.ko"
   }
   dest_file: "kasan/br_netfilter.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_drv2624_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_drv2624_ko.asciipb
index 14ee13b..e6ee5cb 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_drv2624_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_drv2624_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "drv2624.ko"
   }
   dest_file: "kasan/drv2624.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 bca8ce0..c9b6f2e 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "dtbo.img"
   }
   dest_file: "kasan/dtbo.img"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 20216b9..b71bde4 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "ftm5.ko"
   }
   dest_file: "kasan/ftm5.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_gspca_main_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_gspca_main_ko.asciipb
index 331b774..1b1eb08 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_gspca_main_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_gspca_main_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "gspca_main.ko"
   }
   dest_file: "kasan/gspca_main.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_hdmi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_hdmi_dlkm_ko.asciipb
index 5f6c32c..bc45d83 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_hdmi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_hdmi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "hdmi_dlkm.ko"
   }
   dest_file: "kasan/hdmi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 836d0b5..1707494 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "heatmap.ko"
   }
   dest_file: "kasan/heatmap.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 dbca901..f4f9118 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "incrementalfs.ko"
   }
   dest_file: "kasan/incrementalfs.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_lcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_lcd_ko.asciipb
index 3db79e6..9c20902 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_lcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_lcd_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "lcd.ko"
   }
   dest_file: "kasan/lcd.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_llcc_perfmon_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_llcc_perfmon_ko.asciipb
index 23e50ef..fb42147 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_llcc_perfmon_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_llcc_perfmon_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "llcc_perfmon.ko"
   }
   dest_file: "kasan/llcc_perfmon.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 f23edb0..d38a900 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "machine_dlkm.ko"
   }
   dest_file: "kasan/machine_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 e966550..111490c 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "mbhc_dlkm.ko"
   }
   dest_file: "kasan/mbhc_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_mpi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_mpi_ko.asciipb
index baaddda..01392a5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_mpi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_mpi_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "mpi.ko"
   }
   dest_file: "kasan/mpi.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_mpq-adapter_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_mpq-adapter_ko.asciipb
index 535fb51..2f0037a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_mpq-adapter_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_mpq-adapter_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "mpq-adapter.ko"
   }
   dest_file: "kasan/mpq-adapter.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_mpq-dmx-hw-plugin_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_mpq-dmx-hw-plugin_ko.asciipb
index 949620a..e6f2b0e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_mpq-dmx-hw-plugin_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_mpq-dmx-hw-plugin_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "mpq-dmx-hw-plugin.ko"
   }
   dest_file: "kasan/mpq-dmx-hw-plugin.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_msm-geni-ir_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_msm-geni-ir_ko.asciipb
index 8578a9d..cd13678 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_msm-geni-ir_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_msm-geni-ir_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "msm-geni-ir.ko"
   }
   dest_file: "kasan/msm-geni-ir.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 29dbf9e..180c1e9 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "msm_11ad_proxy.ko"
   }
   dest_file: "kasan/msm_11ad_proxy.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 845d856..fe7fb6f 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "native_dlkm.ko"
   }
   dest_file: "kasan/native_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_oid_registry_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_oid_registry_ko.asciipb
index be83d52..68405d1 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_oid_registry_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_oid_registry_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "oid_registry.ko"
   }
   dest_file: "kasan/oid_registry.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_pinctrl_lpi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_pinctrl_lpi_dlkm_ko.asciipb
index 86ed85a..f3a638e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_pinctrl_lpi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_pinctrl_lpi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "pinctrl_lpi_dlkm.ko"
   }
   dest_file: "kasan/pinctrl_lpi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 d722d94..4ff5f4a 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "pinctrl_wcd_dlkm.ko"
   }
   dest_file: "kasan/pinctrl_wcd_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 aa48ce9..0a7b556 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "platform_dlkm.ko"
   }
   dest_file: "kasan/platform_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_public_key_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_public_key_ko.asciipb
index fb07e0a..eb898a7 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_public_key_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_public_key_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "public_key.ko"
   }
   dest_file: "kasan/public_key.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 de5463a..2839430 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "q6_dlkm.ko"
   }
   dest_file: "kasan/q6_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 eca944b..789ebb6 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "q6_notifier_dlkm.ko"
   }
   dest_file: "kasan/q6_notifier_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 2598d38..9588d69 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "q6_pdr_dlkm.ko"
   }
   dest_file: "kasan/q6_pdr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_rdbg_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_rdbg_ko.asciipb
index b283dda..d2c550a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_rdbg_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_rdbg_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "rdbg.ko"
   }
   dest_file: "kasan/rdbg.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_rsa_generic_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_rsa_generic_ko.asciipb
index 0b637d4..8a0bf05 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_rsa_generic_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_rsa_generic_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "rsa_generic.ko"
   }
   dest_file: "kasan/rsa_generic.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_rx_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_rx_macro_dlkm_ko.asciipb
index c551052..2ddf62b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_rx_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_rx_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "rx_macro_dlkm.ko"
   }
   dest_file: "kasan/rx_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdmmagpie_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdmmagpie_dtb.asciipb
index b81e4f5..424acdf 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdmmagpie_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdmmagpie_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "sdmmagpie.dtb"
   }
   dest_file: "kasan/sdmmagpie.dtb"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd_event_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd_event_dlkm_ko.asciipb
index a7a9462..373ce49 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd_event_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd_event_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "snd_event_dlkm.ko"
   }
   dest_file: "kasan/snd_event_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 3e945a1..1d910bc 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "stub_dlkm.ko"
   }
   dest_file: "kasan/stub_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 fef96c0..d21ab1b 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "swr_ctrl_dlkm.ko"
   }
   dest_file: "kasan/swr_ctrl_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 7ec1d84..3d2ba71 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "swr_dlkm.ko"
   }
   dest_file: "kasan/swr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 28a6079..c0c1614 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "test_kasan.ko"
   }
   dest_file: "kasan/test_kasan.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_tx_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_tx_macro_dlkm_ko.asciipb
index 946b2da..1622fad 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_tx_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_tx_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "tx_macro_dlkm.ko"
   }
   dest_file: "kasan/tx_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 9f5af5e..89486a4 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "usf_dlkm.ko"
   }
   dest_file: "kasan/usf_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_va_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_va_macro_dlkm_ko.asciipb
index e6ead36..14b4e6a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_va_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_va_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "va_macro_dlkm.ko"
   }
   dest_file: "kasan/va_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 5a0b71b..0770979 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "wcd934x_dlkm.ko"
   }
   dest_file: "kasan/wcd934x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd937x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd937x_dlkm_ko.asciipb
index ee06534..f668253 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd937x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd937x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "wcd937x_dlkm.ko"
   }
   dest_file: "kasan/wcd937x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd937x_slave_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd937x_slave_dlkm_ko.asciipb
index 54a4ec7..73a4a5b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd937x_slave_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd937x_slave_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "wcd937x_slave_dlkm.ko"
   }
   dest_file: "kasan/wcd937x_slave_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 cef4b34..14dee67 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "wcd9xxx_dlkm.ko"
   }
   dest_file: "kasan/wcd9xxx_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 52c3241..a5a43b1 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "wcd_core_dlkm.ko"
   }
   dest_file: "kasan/wcd_core_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 24c05c4..e96d812 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "wcd_spi_dlkm.ko"
   }
   dest_file: "kasan/wcd_spi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 e490b9c..c8b6294 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "wglink_dlkm.ko"
   }
   dest_file: "kasan/wglink_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 1e6afd6..64e76af 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "wlan.ko"
   }
   dest_file: "kasan/wlan.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 6cb40f8..d7f6195 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "wsa881x_dlkm.ko"
   }
   dest_file: "kasan/wsa881x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wsa_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wsa_macro_dlkm_ko.asciipb
index 05c856a..e975ef6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wsa_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wsa_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "wsa_macro_dlkm.ko"
   }
   dest_file: "kasan/wsa_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_x509_key_parser_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_x509_key_parser_ko.asciipb
index e4e10bc..22c7823 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_x509_key_parser_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_x509_key_parser_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_kasan"
     source_file: "x509_key_parser.ko"
   }
   dest_file: "kasan/x509_key_parser.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 9321a5d..c1923c9 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "kernel-uapi-headers.tar.gz"
   }
   dest_file: "kernel-uapi-headers.tar.gz"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_Image_lz4.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_Image_lz4.asciipb
index 89adb96..9405476 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_Image_lz4.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_Image_lz4.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "Image.lz4"
   }
   dest_file: "khwasan/Image.lz4"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_adsp_loader_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_adsp_loader_dlkm_ko.asciipb
index 6e84b7d..282ca3f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_adsp_loader_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_adsp_loader_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "adsp_loader_dlkm.ko"
   }
   dest_file: "khwasan/adsp_loader_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_apr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_apr_dlkm_ko.asciipb
index 7784238..972dacd 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_apr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_apr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "apr_dlkm.ko"
   }
   dest_file: "khwasan/apr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_asn1_decoder_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_asn1_decoder_ko.asciipb
index 3ef2118..1d01e13 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_asn1_decoder_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_asn1_decoder_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "asn1_decoder.ko"
   }
   dest_file: "khwasan/asn1_decoder.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_bolero_cdc_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_bolero_cdc_dlkm_ko.asciipb
index b1491bc..3d18fda 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_bolero_cdc_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_bolero_cdc_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "bolero_cdc_dlkm.ko"
   }
   dest_file: "khwasan/bolero_cdc_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_br_netfilter_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_br_netfilter_ko.asciipb
index 0a75104..81d6f4a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_br_netfilter_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_br_netfilter_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "br_netfilter.ko"
   }
   dest_file: "khwasan/br_netfilter.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_drv2624_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_drv2624_ko.asciipb
index a970be9..7a74719 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_drv2624_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_drv2624_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "drv2624.ko"
   }
   dest_file: "khwasan/drv2624.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_dtbo_img.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_dtbo_img.asciipb
index 0b03cc6..dda45bd 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_dtbo_img.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_dtbo_img.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "dtbo.img"
   }
   dest_file: "khwasan/dtbo.img"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_ftm5_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_ftm5_ko.asciipb
index 5112d05..92df54e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_ftm5_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_ftm5_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "ftm5.ko"
   }
   dest_file: "khwasan/ftm5.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_gspca_main_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_gspca_main_ko.asciipb
index 1ef293a..8d6c8c7 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_gspca_main_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_gspca_main_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "gspca_main.ko"
   }
   dest_file: "khwasan/gspca_main.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_hdmi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_hdmi_dlkm_ko.asciipb
index 2c9180d..3f81d47 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_hdmi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_hdmi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "hdmi_dlkm.ko"
   }
   dest_file: "khwasan/hdmi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_heatmap_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_heatmap_ko.asciipb
index 9739b91..44e1fea 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_heatmap_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_heatmap_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "heatmap.ko"
   }
   dest_file: "khwasan/heatmap.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_incrementalfs_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_incrementalfs_ko.asciipb
index 26cc2e5..84bb178 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_incrementalfs_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_incrementalfs_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "incrementalfs.ko"
   }
   dest_file: "khwasan/incrementalfs.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_lcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_lcd_ko.asciipb
index 0c88634..887118f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_lcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_lcd_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "lcd.ko"
   }
   dest_file: "khwasan/lcd.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_llcc_perfmon_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_llcc_perfmon_ko.asciipb
index 545a853..fa689c3 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_llcc_perfmon_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_llcc_perfmon_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "llcc_perfmon.ko"
   }
   dest_file: "khwasan/llcc_perfmon.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_machine_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_machine_dlkm_ko.asciipb
index ac9e770..3af3af2 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_machine_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_machine_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "machine_dlkm.ko"
   }
   dest_file: "khwasan/machine_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_mbhc_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_mbhc_dlkm_ko.asciipb
index 377a375..f03e310 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_mbhc_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_mbhc_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "mbhc_dlkm.ko"
   }
   dest_file: "khwasan/mbhc_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_mpi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_mpi_ko.asciipb
index 6e39d4b..7f0daec 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_mpi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_mpi_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "mpi.ko"
   }
   dest_file: "khwasan/mpi.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_mpq-adapter_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_mpq-adapter_ko.asciipb
index 763d17b..e1b6d6d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_mpq-adapter_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_mpq-adapter_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "mpq-adapter.ko"
   }
   dest_file: "khwasan/mpq-adapter.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_mpq-dmx-hw-plugin_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_mpq-dmx-hw-plugin_ko.asciipb
index 20b7229..b324219 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_mpq-dmx-hw-plugin_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_mpq-dmx-hw-plugin_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "mpq-dmx-hw-plugin.ko"
   }
   dest_file: "khwasan/mpq-dmx-hw-plugin.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_msm-geni-ir_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_msm-geni-ir_ko.asciipb
index 74987df..61ff9cb 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_msm-geni-ir_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_msm-geni-ir_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "msm-geni-ir.ko"
   }
   dest_file: "khwasan/msm-geni-ir.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_msm_11ad_proxy_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_msm_11ad_proxy_ko.asciipb
index 5d5c9ad..b7ba948 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_msm_11ad_proxy_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_msm_11ad_proxy_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "msm_11ad_proxy.ko"
   }
   dest_file: "khwasan/msm_11ad_proxy.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_native_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_native_dlkm_ko.asciipb
index ad56a4a..61f21d0 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_native_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_native_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "native_dlkm.ko"
   }
   dest_file: "khwasan/native_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_oid_registry_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_oid_registry_ko.asciipb
index 075a59e..f3a7859 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_oid_registry_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_oid_registry_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "oid_registry.ko"
   }
   dest_file: "khwasan/oid_registry.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_pinctrl_lpi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_pinctrl_lpi_dlkm_ko.asciipb
index 2b5a4fa..5971a65 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_pinctrl_lpi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_pinctrl_lpi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "pinctrl_lpi_dlkm.ko"
   }
   dest_file: "khwasan/pinctrl_lpi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_pinctrl_wcd_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_pinctrl_wcd_dlkm_ko.asciipb
index b495e6a..f816470 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_pinctrl_wcd_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_pinctrl_wcd_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "pinctrl_wcd_dlkm.ko"
   }
   dest_file: "khwasan/pinctrl_wcd_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_platform_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_platform_dlkm_ko.asciipb
index c2cccc7..db5b038 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_platform_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_platform_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "platform_dlkm.ko"
   }
   dest_file: "khwasan/platform_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_public_key_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_public_key_ko.asciipb
index 7557fbc..419ad76 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_public_key_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_public_key_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "public_key.ko"
   }
   dest_file: "khwasan/public_key.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_q6_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_q6_dlkm_ko.asciipb
index d227f81..21dc63b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_q6_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_q6_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "q6_dlkm.ko"
   }
   dest_file: "khwasan/q6_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_q6_notifier_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_q6_notifier_dlkm_ko.asciipb
index 26bbde1..8167d95 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_q6_notifier_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_q6_notifier_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "q6_notifier_dlkm.ko"
   }
   dest_file: "khwasan/q6_notifier_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_q6_pdr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_q6_pdr_dlkm_ko.asciipb
index bc9f05f..9c1efb3 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_q6_pdr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_q6_pdr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "q6_pdr_dlkm.ko"
   }
   dest_file: "khwasan/q6_pdr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_rdbg_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_rdbg_ko.asciipb
index 01c5a46..bac301a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_rdbg_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_rdbg_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "rdbg.ko"
   }
   dest_file: "khwasan/rdbg.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_rsa_generic_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_rsa_generic_ko.asciipb
index 8f052c0..1bb7e6e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_rsa_generic_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_rsa_generic_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "rsa_generic.ko"
   }
   dest_file: "khwasan/rsa_generic.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_rx_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_rx_macro_dlkm_ko.asciipb
index a62841e..c6122af 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_rx_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_rx_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "rx_macro_dlkm.ko"
   }
   dest_file: "khwasan/rx_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_sdmmagpie_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_sdmmagpie_dtb.asciipb
index 8a7521a..6acba56 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_sdmmagpie_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_sdmmagpie_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "sdmmagpie.dtb"
   }
   dest_file: "khwasan/sdmmagpie.dtb"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_snd_event_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_snd_event_dlkm_ko.asciipb
index 0b78333..c9365b1 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_snd_event_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_snd_event_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "snd_event_dlkm.ko"
   }
   dest_file: "khwasan/snd_event_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_stub_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_stub_dlkm_ko.asciipb
index e48967c..92be9a2 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_stub_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_stub_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "stub_dlkm.ko"
   }
   dest_file: "khwasan/stub_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_swr_ctrl_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_swr_ctrl_dlkm_ko.asciipb
index 6220128..b9b883d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_swr_ctrl_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_swr_ctrl_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "swr_ctrl_dlkm.ko"
   }
   dest_file: "khwasan/swr_ctrl_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_swr_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_swr_dlkm_ko.asciipb
index ef22994..85912c6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_swr_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_swr_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "swr_dlkm.ko"
   }
   dest_file: "khwasan/swr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_test_kasan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_test_kasan_ko.asciipb
index c95c19d..1d3e7de 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_test_kasan_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_test_kasan_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "test_kasan.ko"
   }
   dest_file: "khwasan/test_kasan.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_tx_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_tx_macro_dlkm_ko.asciipb
index 60bbc8c..0e64c9c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_tx_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_tx_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "tx_macro_dlkm.ko"
   }
   dest_file: "khwasan/tx_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_usf_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_usf_dlkm_ko.asciipb
index 96aaf68..eb53523 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_usf_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_usf_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "usf_dlkm.ko"
   }
   dest_file: "khwasan/usf_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_va_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_va_macro_dlkm_ko.asciipb
index 7ae1164..7735d3c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_va_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_va_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "va_macro_dlkm.ko"
   }
   dest_file: "khwasan/va_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd934x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd934x_dlkm_ko.asciipb
index 5d7f2d5..4da14e9 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd934x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd934x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "wcd934x_dlkm.ko"
   }
   dest_file: "khwasan/wcd934x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd937x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd937x_dlkm_ko.asciipb
index f4e5d6d..c919079 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd937x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd937x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "wcd937x_dlkm.ko"
   }
   dest_file: "khwasan/wcd937x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd937x_slave_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd937x_slave_dlkm_ko.asciipb
index f5bc256..3d88804 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd937x_slave_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd937x_slave_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "wcd937x_slave_dlkm.ko"
   }
   dest_file: "khwasan/wcd937x_slave_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd9xxx_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd9xxx_dlkm_ko.asciipb
index 4874d71..8f0e9c5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd9xxx_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd9xxx_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "wcd9xxx_dlkm.ko"
   }
   dest_file: "khwasan/wcd9xxx_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd_core_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd_core_dlkm_ko.asciipb
index 37532be..478dc14 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd_core_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd_core_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "wcd_core_dlkm.ko"
   }
   dest_file: "khwasan/wcd_core_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd_spi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd_spi_dlkm_ko.asciipb
index 0e9172c..e9d4b6b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd_spi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wcd_spi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "wcd_spi_dlkm.ko"
   }
   dest_file: "khwasan/wcd_spi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wglink_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wglink_dlkm_ko.asciipb
index 595fc0c..01b42b9 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wglink_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wglink_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "wglink_dlkm.ko"
   }
   dest_file: "khwasan/wglink_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wlan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wlan_ko.asciipb
index cd829e8..a214361 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wlan_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wlan_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "wlan.ko"
   }
   dest_file: "khwasan/wlan.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wsa881x_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wsa881x_dlkm_ko.asciipb
index 23f20ca..814377c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wsa881x_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wsa881x_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "wsa881x_dlkm.ko"
   }
   dest_file: "khwasan/wsa881x_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wsa_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wsa_macro_dlkm_ko.asciipb
index 36c909a..8ff8392 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wsa_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_wsa_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "wsa_macro_dlkm.ko"
   }
   dest_file: "khwasan/wsa_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_x509_key_parser_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_x509_key_parser_ko.asciipb
index 2610742..9e97355 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_x509_key_parser_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_khwasan_x509_key_parser_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish_khwasan"
     source_file: "x509_key_parser.ko"
   }
   dest_file: "khwasan/x509_key_parser.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_lcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_lcd_ko.asciipb
index f3566e0..5bcd5af 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_lcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_lcd_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "lcd.ko"
   }
   dest_file: "lcd.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_llcc_perfmon_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_llcc_perfmon_ko.asciipb
index 85d381f..067c1ba 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_llcc_perfmon_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_llcc_perfmon_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "llcc_perfmon.ko"
   }
   dest_file: "llcc_perfmon.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 247b840..3c1a355 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "machine_dlkm.ko"
   }
   dest_file: "machine_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 57f41f5..2f0eacf 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "mbhc_dlkm.ko"
   }
   dest_file: "mbhc_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_mpi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_mpi_ko.asciipb
index bb1ecff..6c5362d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_mpi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_mpi_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "mpi.ko"
   }
   dest_file: "mpi.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_mpq-adapter_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_mpq-adapter_ko.asciipb
index 07e7a30..d148ff6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_mpq-adapter_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_mpq-adapter_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "mpq-adapter.ko"
   }
   dest_file: "mpq-adapter.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_mpq-dmx-hw-plugin_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_mpq-dmx-hw-plugin_ko.asciipb
index 91ac833..550fe8e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_mpq-dmx-hw-plugin_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_mpq-dmx-hw-plugin_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "mpq-dmx-hw-plugin.ko"
   }
   dest_file: "mpq-dmx-hw-plugin.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_msm-geni-ir_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_msm-geni-ir_ko.asciipb
index 83222fb..ff0e00f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_msm-geni-ir_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_msm-geni-ir_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "msm-geni-ir.ko"
   }
   dest_file: "msm-geni-ir.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 7ba9cca..8f6aedd 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "msm_11ad_proxy.ko"
   }
   dest_file: "msm_11ad_proxy.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 ad792de..fa8a153 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "native_dlkm.ko"
   }
   dest_file: "native_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_oid_registry_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_oid_registry_ko.asciipb
index 6bb29f0..a05bc37 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_oid_registry_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_oid_registry_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "oid_registry.ko"
   }
   dest_file: "oid_registry.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_pinctrl_lpi_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_pinctrl_lpi_dlkm_ko.asciipb
index 7224e94..d50ea4e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_pinctrl_lpi_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_pinctrl_lpi_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "pinctrl_lpi_dlkm.ko"
   }
   dest_file: "pinctrl_lpi_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 dd45071..2af9fa7 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "pinctrl_wcd_dlkm.ko"
   }
   dest_file: "pinctrl_wcd_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 6f2b1be..288e293 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "platform_dlkm.ko"
   }
   dest_file: "platform_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_public_key_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_public_key_ko.asciipb
index 6f886e9..6be1ec6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_public_key_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_public_key_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "public_key.ko"
   }
   dest_file: "public_key.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 0b4f74f..71c62d8 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "q6_dlkm.ko"
   }
   dest_file: "q6_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 6bfd189..e45eee3 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "q6_notifier_dlkm.ko"
   }
   dest_file: "q6_notifier_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-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 101b9ef..a9d35f5 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   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "q6_pdr_dlkm.ko"
   }
   dest_file: "q6_pdr_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_rdbg_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_rdbg_ko.asciipb
index b82074a..a2e0265 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_rdbg_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_rdbg_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "rdbg.ko"
   }
   dest_file: "rdbg.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_rsa_generic_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_rsa_generic_ko.asciipb
index da43641..521686f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_rsa_generic_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_rsa_generic_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "rsa_generic.ko"
   }
   dest_file: "rsa_generic.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/sunfish-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_rx_macro_dlkm_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_rx_macro_dlkm_ko.asciipb
index 08e61a1..67ea4da 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_rx_macro_dlkm_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_rx_macro_dlkm_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
     build_id: "7047867"
-=======
-    build_id: "7079318"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_sunfish"
     source_file: "rx_macro_dlkm.ko"
   }
   dest_file: "rx_macro_dlkm.ko"
-<<<<<<< HEAD   (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
   version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
-=======
-  version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
->>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])<