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 18c6cc586f9a935461f3b10056c8ffae294f45a4.

Reason for revert: b/177499518 - Broken build

Change-Id: I2e6bbc3c259f290b47d68896e88836604044fc37
(cherry picked from commit 40c87df00c63b7c47c0f1151d9f887c15f6c9df5)
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 3c0979d..34a2b4d 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito"
     source_file: "Image.lz4"
   }
   dest_file: "Image.lz4"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 ab704af..37319ac 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_api"
     source_file: "Image.lz4"
   }
   dest_file: "debug_api/Image.lz4"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 806b667..5b88b68 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_api"
     source_file: "dtbo.img"
   }
   dest_file: "debug_api/dtbo.img"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 a2b5f37..aa54d27 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_api"
     source_file: "lcd.ko"
   }
   dest_file: "debug_api/lcd.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm670_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm670_dtb.asciipb
index 1ac8e74..782da4a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm670_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm670_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_api"
     source_file: "sdm670.dtb"
   }
   dest_file: "debug_api/sdm670.dtb"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_synaptics_dsx_core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_synaptics_dsx_core_ko.asciipb
index fbf3f48..8394851 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_synaptics_dsx_core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_synaptics_dsx_core_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_api"
     source_file: "synaptics_dsx_core.ko"
   }
   dest_file: "debug_api/synaptics_dsx_core.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_synaptics_dsx_fw_update_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_synaptics_dsx_fw_update_ko.asciipb
index e79c8e1..258074c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_synaptics_dsx_fw_update_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_synaptics_dsx_fw_update_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_api"
     source_file: "synaptics_dsx_fw_update.ko"
   }
   dest_file: "debug_api/synaptics_dsx_fw_update.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_synaptics_dsx_rmi_dev_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_synaptics_dsx_rmi_dev_ko.asciipb
index c1b2b3a..2afbc06 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_synaptics_dsx_rmi_dev_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_synaptics_dsx_rmi_dev_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_api"
     source_file: "synaptics_dsx_rmi_dev.ko"
   }
   dest_file: "debug_api/synaptics_dsx_rmi_dev.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_synaptics_dsx_test_reporting_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_synaptics_dsx_test_reporting_ko.asciipb
index a589379..a3771d5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_synaptics_dsx_test_reporting_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_synaptics_dsx_test_reporting_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_api"
     source_file: "synaptics_dsx_test_reporting.ko"
   }
   dest_file: "debug_api/synaptics_dsx_test_reporting.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 2c3aab0..e2ec2a4 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_api"
     source_file: "wlan.ko"
   }
   dest_file: "debug_api/wlan.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 dc89054..64c80a2 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_hang"
     source_file: "Image.lz4"
   }
   dest_file: "debug_hang/Image.lz4"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 b5377d1..7daf975 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_hang"
     source_file: "dtbo.img"
   }
   dest_file: "debug_hang/dtbo.img"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 1fbe7d6..ba82f9a 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_hang"
     source_file: "lcd.ko"
   }
   dest_file: "debug_hang/lcd.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm670_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm670_dtb.asciipb
index 9ed2596..c53a2cd 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm670_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm670_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_hang"
     source_file: "sdm670.dtb"
   }
   dest_file: "debug_hang/sdm670.dtb"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_synaptics_dsx_core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_synaptics_dsx_core_ko.asciipb
index cd38bca..094f4a7 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_synaptics_dsx_core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_synaptics_dsx_core_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_hang"
     source_file: "synaptics_dsx_core.ko"
   }
   dest_file: "debug_hang/synaptics_dsx_core.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_synaptics_dsx_fw_update_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_synaptics_dsx_fw_update_ko.asciipb
index 57e982e..9043b59 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_synaptics_dsx_fw_update_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_synaptics_dsx_fw_update_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_hang"
     source_file: "synaptics_dsx_fw_update.ko"
   }
   dest_file: "debug_hang/synaptics_dsx_fw_update.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_synaptics_dsx_rmi_dev_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_synaptics_dsx_rmi_dev_ko.asciipb
index 14219d8..336707e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_synaptics_dsx_rmi_dev_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_synaptics_dsx_rmi_dev_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_hang"
     source_file: "synaptics_dsx_rmi_dev.ko"
   }
   dest_file: "debug_hang/synaptics_dsx_rmi_dev.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_synaptics_dsx_test_reporting_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_synaptics_dsx_test_reporting_ko.asciipb
index 980b646..5012e82 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_synaptics_dsx_test_reporting_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_synaptics_dsx_test_reporting_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_hang"
     source_file: "synaptics_dsx_test_reporting.ko"
   }
   dest_file: "debug_hang/synaptics_dsx_test_reporting.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 61abcb6..d753425 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_hang"
     source_file: "wlan.ko"
   }
   dest_file: "debug_hang/wlan.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 558211e..03cc885 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_locking"
     source_file: "Image.lz4"
   }
   dest_file: "debug_locking/Image.lz4"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 0794d2d..fca0b11 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_locking"
     source_file: "dtbo.img"
   }
   dest_file: "debug_locking/dtbo.img"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 d70cbd5..4921ddb 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_locking"
     source_file: "lcd.ko"
   }
   dest_file: "debug_locking/lcd.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm670_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm670_dtb.asciipb
index 717e6cf..f2bc78a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm670_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm670_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_locking"
     source_file: "sdm670.dtb"
   }
   dest_file: "debug_locking/sdm670.dtb"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_synaptics_dsx_core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_synaptics_dsx_core_ko.asciipb
index bdf0adc..e28905d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_synaptics_dsx_core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_synaptics_dsx_core_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_locking"
     source_file: "synaptics_dsx_core.ko"
   }
   dest_file: "debug_locking/synaptics_dsx_core.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_synaptics_dsx_fw_update_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_synaptics_dsx_fw_update_ko.asciipb
index aa1fb43..4e43217 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_synaptics_dsx_fw_update_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_synaptics_dsx_fw_update_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_locking"
     source_file: "synaptics_dsx_fw_update.ko"
   }
   dest_file: "debug_locking/synaptics_dsx_fw_update.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_synaptics_dsx_rmi_dev_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_synaptics_dsx_rmi_dev_ko.asciipb
index 457e38a..b12eb1c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_synaptics_dsx_rmi_dev_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_synaptics_dsx_rmi_dev_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_locking"
     source_file: "synaptics_dsx_rmi_dev.ko"
   }
   dest_file: "debug_locking/synaptics_dsx_rmi_dev.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_synaptics_dsx_test_reporting_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_synaptics_dsx_test_reporting_ko.asciipb
index b63fe4f..be322a5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_synaptics_dsx_test_reporting_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_synaptics_dsx_test_reporting_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_locking"
     source_file: "synaptics_dsx_test_reporting.ko"
   }
   dest_file: "debug_locking/synaptics_dsx_test_reporting.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 9059deb..8453991 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_locking"
     source_file: "wlan.ko"
   }
   dest_file: "debug_locking/wlan.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 453e5a8..b3109f5 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_memory"
     source_file: "Image.lz4"
   }
   dest_file: "debug_memory/Image.lz4"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 66f0167..6e8b962 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_memory"
     source_file: "dtbo.img"
   }
   dest_file: "debug_memory/dtbo.img"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 61b1952..bf06c02 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_memory"
     source_file: "lcd.ko"
   }
   dest_file: "debug_memory/lcd.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm670_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm670_dtb.asciipb
index 707d2d5..efd29c3 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm670_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm670_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_memory"
     source_file: "sdm670.dtb"
   }
   dest_file: "debug_memory/sdm670.dtb"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_synaptics_dsx_core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_synaptics_dsx_core_ko.asciipb
index c72c194..81ff7ab 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_synaptics_dsx_core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_synaptics_dsx_core_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_memory"
     source_file: "synaptics_dsx_core.ko"
   }
   dest_file: "debug_memory/synaptics_dsx_core.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_synaptics_dsx_fw_update_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_synaptics_dsx_fw_update_ko.asciipb
index 03948c2..f22cea5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_synaptics_dsx_fw_update_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_synaptics_dsx_fw_update_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_memory"
     source_file: "synaptics_dsx_fw_update.ko"
   }
   dest_file: "debug_memory/synaptics_dsx_fw_update.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_synaptics_dsx_rmi_dev_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_synaptics_dsx_rmi_dev_ko.asciipb
index da2a028..dd95722 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_synaptics_dsx_rmi_dev_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_synaptics_dsx_rmi_dev_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_memory"
     source_file: "synaptics_dsx_rmi_dev.ko"
   }
   dest_file: "debug_memory/synaptics_dsx_rmi_dev.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_synaptics_dsx_test_reporting_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_synaptics_dsx_test_reporting_ko.asciipb
index 0a8d0fa..412a16f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_synaptics_dsx_test_reporting_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_synaptics_dsx_test_reporting_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_memory"
     source_file: "synaptics_dsx_test_reporting.ko"
   }
   dest_file: "debug_memory/synaptics_dsx_test_reporting.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 632e13d..708020a 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_debug_memory"
     source_file: "wlan.ko"
   }
   dest_file: "debug_memory/wlan.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 f0efaf0..caa18ce 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito"
     source_file: "dtbo.img"
   }
   dest_file: "dtbo.img"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 2936590..67a2309 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_kasan"
     source_file: "Image.lz4"
   }
   dest_file: "kasan/Image.lz4"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 9a3a135..42dacd2 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_kasan"
     source_file: "dtbo.img"
   }
   dest_file: "kasan/dtbo.img"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 f1613b1..df7931b 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_kasan"
     source_file: "lcd.ko"
   }
   dest_file: "kasan/lcd.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm670_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm670_dtb.asciipb
index 0782009..400f7e6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm670_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm670_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_kasan"
     source_file: "sdm670.dtb"
   }
   dest_file: "kasan/sdm670.dtb"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_synaptics_dsx_core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_synaptics_dsx_core_ko.asciipb
index b9de337..9cbe16e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_synaptics_dsx_core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_synaptics_dsx_core_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_kasan"
     source_file: "synaptics_dsx_core.ko"
   }
   dest_file: "kasan/synaptics_dsx_core.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_synaptics_dsx_fw_update_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_synaptics_dsx_fw_update_ko.asciipb
index 0640616..03f4301 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_synaptics_dsx_fw_update_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_synaptics_dsx_fw_update_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_kasan"
     source_file: "synaptics_dsx_fw_update.ko"
   }
   dest_file: "kasan/synaptics_dsx_fw_update.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_synaptics_dsx_rmi_dev_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_synaptics_dsx_rmi_dev_ko.asciipb
index 05a4bc8..4476696 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_synaptics_dsx_rmi_dev_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_synaptics_dsx_rmi_dev_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_kasan"
     source_file: "synaptics_dsx_rmi_dev.ko"
   }
   dest_file: "kasan/synaptics_dsx_rmi_dev.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_synaptics_dsx_test_reporting_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_synaptics_dsx_test_reporting_ko.asciipb
index 3d157c0..fea90bb 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_synaptics_dsx_test_reporting_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_synaptics_dsx_test_reporting_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_kasan"
     source_file: "synaptics_dsx_test_reporting.ko"
   }
   dest_file: "kasan/synaptics_dsx_test_reporting.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 c12db87..4c02b76 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_kasan"
     source_file: "test_kasan.ko"
   }
   dest_file: "kasan/test_kasan.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 94eb950..37ee558 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito_kasan"
     source_file: "wlan.ko"
   }
   dest_file: "kasan/wlan.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-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 160bf19..2001af5 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   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito"
     source_file: "lcd.ko"
   }
   dest_file: "lcd.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm670_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm670_dtb.asciipb
index baeb544..78d8dce 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm670_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm670_dtb.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito"
     source_file: "sdm670.dtb"
   }
   dest_file: "sdm670.dtb"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_synaptics_dsx_core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_synaptics_dsx_core_ko.asciipb
index 769e032..75ba173 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_synaptics_dsx_core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_synaptics_dsx_core_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito"
     source_file: "synaptics_dsx_core.ko"
   }
   dest_file: "synaptics_dsx_core.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_synaptics_dsx_fw_update_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_synaptics_dsx_fw_update_ko.asciipb
index e7188d8..db1c34b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_synaptics_dsx_fw_update_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_synaptics_dsx_fw_update_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito"
     source_file: "synaptics_dsx_fw_update.ko"
   }
   dest_file: "synaptics_dsx_fw_update.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_synaptics_dsx_rmi_dev_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_synaptics_dsx_rmi_dev_ko.asciipb
index 6ffa7df..966f8c6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_synaptics_dsx_rmi_dev_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_synaptics_dsx_rmi_dev_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito"
     source_file: "synaptics_dsx_rmi_dev.ko"
   }
   dest_file: "synaptics_dsx_rmi_dev.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_synaptics_dsx_test_reporting_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_synaptics_dsx_test_reporting_ko.asciipb
index b006680..95fdd74 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_synaptics_dsx_test_reporting_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_synaptics_dsx_test_reporting_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito"
     source_file: "synaptics_dsx_test_reporting.ko"
   }
   dest_file: "synaptics_dsx_test_reporting.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_wlan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_wlan_ko.asciipb
index df983a3..514a842 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_wlan_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_wlan_ko.asciipb
@@ -1,19 +1,11 @@
 drops {
   android_build_drop {
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
     build_id: "7046903"
-=======
-    build_id: "7079298"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
     target: "kernel_bonito"
     source_file: "wlan.ko"
   }
   dest_file: "wlan.ko"
-<<<<<<< HEAD   (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
   version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
-=======
-  version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
->>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
   version_group: "kernel-and-modules"
   git_project: "device/google/bonito-kernel"
 }
diff --git a/Image.lz4 b/Image.lz4
index e69de29..bd95874 100644
--- a/Image.lz4
+++ b/Image.lz4
Binary files differ
diff --git a/debug_api/Image.lz4 b/debug_api/Image.lz4
index e69de29..a4ceefd 100644
--- a/debug_api/Image.lz4
+++ b/debug_api/Image.lz4
Binary files differ
diff --git a/debug_api/lcd.ko b/debug_api/lcd.ko
index e69de29..f7ab280 100644
--- a/debug_api/lcd.ko
+++ b/debug_api/lcd.ko
Binary files differ
diff --git a/debug_api/synaptics_dsx_core.ko b/debug_api/synaptics_dsx_core.ko
index e69de29..5692b6d 100644
--- a/debug_api/synaptics_dsx_core.ko
+++ b/debug_api/synaptics_dsx_core.ko
Binary files differ
diff --git a/debug_api/synaptics_dsx_fw_update.ko b/debug_api/synaptics_dsx_fw_update.ko
index e69de29..aeb67f4 100644
--- a/debug_api/synaptics_dsx_fw_update.ko
+++ b/debug_api/synaptics_dsx_fw_update.ko
Binary files differ
diff --git a/debug_api/synaptics_dsx_rmi_dev.ko b/debug_api/synaptics_dsx_rmi_dev.ko
index e69de29..6b91a50 100644
--- a/debug_api/synaptics_dsx_rmi_dev.ko
+++ b/debug_api/synaptics_dsx_rmi_dev.ko
Binary files differ
diff --git a/debug_api/synaptics_dsx_test_reporting.ko b/debug_api/synaptics_dsx_test_reporting.ko
index e69de29..d0a66aa 100644
--- a/debug_api/synaptics_dsx_test_reporting.ko
+++ b/debug_api/synaptics_dsx_test_reporting.ko
Binary files differ
diff --git a/debug_api/wlan.ko b/debug_api/wlan.ko
index e69de29..f85fb37 100644
--- a/debug_api/wlan.ko
+++ b/debug_api/wlan.ko
Binary files differ
diff --git a/debug_hang/Image.lz4 b/debug_hang/Image.lz4
index e69de29..f7b7b19 100644
--- a/debug_hang/Image.lz4
+++ b/debug_hang/Image.lz4
Binary files differ
diff --git a/debug_hang/lcd.ko b/debug_hang/lcd.ko
index e69de29..01f5fad 100644
--- a/debug_hang/lcd.ko
+++ b/debug_hang/lcd.ko
Binary files differ
diff --git a/debug_hang/synaptics_dsx_core.ko b/debug_hang/synaptics_dsx_core.ko
index e69de29..3c9392d 100644
--- a/debug_hang/synaptics_dsx_core.ko
+++ b/debug_hang/synaptics_dsx_core.ko
Binary files differ
diff --git a/debug_hang/synaptics_dsx_fw_update.ko b/debug_hang/synaptics_dsx_fw_update.ko
index e69de29..cebb5a8 100644
--- a/debug_hang/synaptics_dsx_fw_update.ko
+++ b/debug_hang/synaptics_dsx_fw_update.ko
Binary files differ
diff --git a/debug_hang/synaptics_dsx_rmi_dev.ko b/debug_hang/synaptics_dsx_rmi_dev.ko
index e69de29..d44e3d0 100644
--- a/debug_hang/synaptics_dsx_rmi_dev.ko
+++ b/debug_hang/synaptics_dsx_rmi_dev.ko
Binary files differ
diff --git a/debug_hang/synaptics_dsx_test_reporting.ko b/debug_hang/synaptics_dsx_test_reporting.ko
index e69de29..7f93c44 100644
--- a/debug_hang/synaptics_dsx_test_reporting.ko
+++ b/debug_hang/synaptics_dsx_test_reporting.ko
Binary files differ
diff --git a/debug_hang/wlan.ko b/debug_hang/wlan.ko
index e69de29..5555042 100644
--- a/debug_hang/wlan.ko
+++ b/debug_hang/wlan.ko
Binary files differ
diff --git a/debug_locking/Image.lz4 b/debug_locking/Image.lz4
index e69de29..22424cc 100644
--- a/debug_locking/Image.lz4
+++ b/debug_locking/Image.lz4
Binary files differ
diff --git a/debug_locking/lcd.ko b/debug_locking/lcd.ko
index e69de29..10eb1d7 100644
--- a/debug_locking/lcd.ko
+++ b/debug_locking/lcd.ko
Binary files differ
diff --git a/debug_locking/synaptics_dsx_core.ko b/debug_locking/synaptics_dsx_core.ko
index e69de29..6fa014c 100644
--- a/debug_locking/synaptics_dsx_core.ko
+++ b/debug_locking/synaptics_dsx_core.ko
Binary files differ
diff --git a/debug_locking/synaptics_dsx_fw_update.ko b/debug_locking/synaptics_dsx_fw_update.ko
index e69de29..1d73dd4 100644
--- a/debug_locking/synaptics_dsx_fw_update.ko
+++ b/debug_locking/synaptics_dsx_fw_update.ko
Binary files differ
diff --git a/debug_locking/synaptics_dsx_rmi_dev.ko b/debug_locking/synaptics_dsx_rmi_dev.ko
index e69de29..f35657c 100644
--- a/debug_locking/synaptics_dsx_rmi_dev.ko
+++ b/debug_locking/synaptics_dsx_rmi_dev.ko
Binary files differ
diff --git a/debug_locking/synaptics_dsx_test_reporting.ko b/debug_locking/synaptics_dsx_test_reporting.ko
index e69de29..7fdeb96 100644
--- a/debug_locking/synaptics_dsx_test_reporting.ko
+++ b/debug_locking/synaptics_dsx_test_reporting.ko
Binary files differ
diff --git a/debug_locking/wlan.ko b/debug_locking/wlan.ko
index e69de29..dff21f4 100644
--- a/debug_locking/wlan.ko
+++ b/debug_locking/wlan.ko
Binary files differ
diff --git a/debug_memory/Image.lz4 b/debug_memory/Image.lz4
index e69de29..9255204 100644
--- a/debug_memory/Image.lz4
+++ b/debug_memory/Image.lz4
Binary files differ
diff --git a/debug_memory/lcd.ko b/debug_memory/lcd.ko
index e69de29..f597daf 100644
--- a/debug_memory/lcd.ko
+++ b/debug_memory/lcd.ko
Binary files differ
diff --git a/debug_memory/synaptics_dsx_core.ko b/debug_memory/synaptics_dsx_core.ko
index e69de29..7422cb7 100644
--- a/debug_memory/synaptics_dsx_core.ko
+++ b/debug_memory/synaptics_dsx_core.ko
Binary files differ
diff --git a/debug_memory/synaptics_dsx_fw_update.ko b/debug_memory/synaptics_dsx_fw_update.ko
index e69de29..d51e883 100644
--- a/debug_memory/synaptics_dsx_fw_update.ko
+++ b/debug_memory/synaptics_dsx_fw_update.ko
Binary files differ
diff --git a/debug_memory/synaptics_dsx_rmi_dev.ko b/debug_memory/synaptics_dsx_rmi_dev.ko
index e69de29..b68bd7b 100644
--- a/debug_memory/synaptics_dsx_rmi_dev.ko
+++ b/debug_memory/synaptics_dsx_rmi_dev.ko
Binary files differ
diff --git a/debug_memory/synaptics_dsx_test_reporting.ko b/debug_memory/synaptics_dsx_test_reporting.ko
index e69de29..921490c 100644
--- a/debug_memory/synaptics_dsx_test_reporting.ko
+++ b/debug_memory/synaptics_dsx_test_reporting.ko
Binary files differ
diff --git a/debug_memory/wlan.ko b/debug_memory/wlan.ko
index e69de29..2759f51 100644
--- a/debug_memory/wlan.ko
+++ b/debug_memory/wlan.ko
Binary files differ
diff --git a/kasan/Image.lz4 b/kasan/Image.lz4
index e69de29..70f95c6 100644
--- a/kasan/Image.lz4
+++ b/kasan/Image.lz4
Binary files differ
diff --git a/kasan/lcd.ko b/kasan/lcd.ko
index e69de29..bb6d06d 100644
--- a/kasan/lcd.ko
+++ b/kasan/lcd.ko
Binary files differ
diff --git a/kasan/synaptics_dsx_core.ko b/kasan/synaptics_dsx_core.ko
index e69de29..568fb8d 100644
--- a/kasan/synaptics_dsx_core.ko
+++ b/kasan/synaptics_dsx_core.ko
Binary files differ
diff --git a/kasan/synaptics_dsx_fw_update.ko b/kasan/synaptics_dsx_fw_update.ko
index e69de29..9ec10bb 100644
--- a/kasan/synaptics_dsx_fw_update.ko
+++ b/kasan/synaptics_dsx_fw_update.ko
Binary files differ
diff --git a/kasan/synaptics_dsx_rmi_dev.ko b/kasan/synaptics_dsx_rmi_dev.ko
index e69de29..18b1c18 100644
--- a/kasan/synaptics_dsx_rmi_dev.ko
+++ b/kasan/synaptics_dsx_rmi_dev.ko
Binary files differ
diff --git a/kasan/synaptics_dsx_test_reporting.ko b/kasan/synaptics_dsx_test_reporting.ko
index e69de29..7d8325d 100644
--- a/kasan/synaptics_dsx_test_reporting.ko
+++ b/kasan/synaptics_dsx_test_reporting.ko
Binary files differ
diff --git a/kasan/test_kasan.ko b/kasan/test_kasan.ko
index e69de29..e80f659 100644
--- a/kasan/test_kasan.ko
+++ b/kasan/test_kasan.ko
Binary files differ
diff --git a/kasan/wlan.ko b/kasan/wlan.ko
index e69de29..88c11cc 100644
--- a/kasan/wlan.ko
+++ b/kasan/wlan.ko
Binary files differ
diff --git a/lcd.ko b/lcd.ko
index e69de29..41b3be6 100644
--- a/lcd.ko
+++ b/lcd.ko
Binary files differ
diff --git a/synaptics_dsx_core.ko b/synaptics_dsx_core.ko
index e69de29..3bdba5f 100644
--- a/synaptics_dsx_core.ko
+++ b/synaptics_dsx_core.ko
Binary files differ
diff --git a/synaptics_dsx_fw_update.ko b/synaptics_dsx_fw_update.ko
index e69de29..e008086 100644
--- a/synaptics_dsx_fw_update.ko
+++ b/synaptics_dsx_fw_update.ko
Binary files differ
diff --git a/synaptics_dsx_rmi_dev.ko b/synaptics_dsx_rmi_dev.ko
index e69de29..52f154e 100644
--- a/synaptics_dsx_rmi_dev.ko
+++ b/synaptics_dsx_rmi_dev.ko
Binary files differ
diff --git a/synaptics_dsx_test_reporting.ko b/synaptics_dsx_test_reporting.ko
index e69de29..07bfa05 100644
--- a/synaptics_dsx_test_reporting.ko
+++ b/synaptics_dsx_test_reporting.ko
Binary files differ
diff --git a/wlan.ko b/wlan.ko
index e69de29..776754f 100644
--- a/wlan.ko
+++ b/wlan.ko
Binary files differ