DO NOT MERGE - Merge RQ3A.210805.001.A1.android-s-beta-5android-s-beta-5

Bug: 192585466
Merged-In: I31bb8cf799d748f3ab040f195c00f7b0af0b1a71
Change-Id: I528b4aab05015824b61e563c56dd1ddd7c89db64

115 files changed, 230 insertions, 230 deletions

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 54a8437b9..622dee700 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_Image_lz4.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_Image_lz4.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "Image.lz4"
   }
   dest_file: "Image.lz4"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_Image_lz4.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_Image_lz4.asciipb
index ddb89b2fc..562054fa4 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,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "Image.lz4"
   }
   dest_file: "debug_api/Image.lz4"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_dtbo_img.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_dtbo_img.asciipb
index 5f312d157..29e54fbcc 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,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "dtbo.img"
   }
   dest_file: "debug_api/dtbo.img"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_ftm5_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_ftm5_ko.asciipb
index f1d42a53d..8297473bd 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_ftm5_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_ftm5_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "ftm5.ko"
   }
   dest_file: "debug_api/ftm5.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_heatmap_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_heatmap_ko.asciipb
index 7b66df2a6..1736c7198 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_heatmap_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_heatmap_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "heatmap.ko"
   }
   dest_file: "debug_api/heatmap.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_pinctrl-wcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_pinctrl-wcd_ko.asciipb
index f4f4d5fba..93ba5b6f0 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_pinctrl-wcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_pinctrl-wcd_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "pinctrl-wcd.ko"
   }
   dest_file: "debug_api/pinctrl-wcd.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm845-v2_1_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm845-v2_1_dtb.asciipb
index ee04810a0..b4df6e3cb 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm845-v2_1_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm845-v2_1_dtb.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "sdm845-v2.1.dtb"
   }
   dest_file: "debug_api/sdm845-v2.1.dtb"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm845-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm845-v2_dtb.asciipb
index 60f8bb613..2eb0e5c71 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm845-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sdm845-v2_dtb.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "sdm845-v2.dtb"
   }
   dest_file: "debug_api/sdm845-v2.dtb"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sec_touch_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sec_touch_ko.asciipb
index 71734e475..1cc7323fd 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sec_touch_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_sec_touch_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "sec_touch.ko"
   }
   dest_file: "debug_api/sec_touch.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-cs35l36_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-cs35l36_ko.asciipb
index a36811b2f..7057d5057 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-cs35l36_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-cs35l36_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "snd-soc-cs35l36.ko"
   }
   dest_file: "debug_api/snd-soc-cs35l36.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-sdm845-max98927_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-sdm845-max98927_ko.asciipb
index f7c2e3477..3e09225dd 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-sdm845-max98927_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-sdm845-max98927_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "snd-soc-sdm845-max98927.ko"
   }
   dest_file: "debug_api/snd-soc-sdm845-max98927.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-sdm845_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-sdm845_ko.asciipb
index 75ea38b14..ddded0ca1 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-sdm845_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-sdm845_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "snd-soc-sdm845.ko"
   }
   dest_file: "debug_api/snd-soc-sdm845.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd-spi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd-spi_ko.asciipb
index b3fce1c64..aad847c4c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd-spi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd-spi_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "snd-soc-wcd-spi.ko"
   }
   dest_file: "debug_api/snd-soc-wcd-spi.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd934x_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd934x_ko.asciipb
index f4373a4f0..48d958344 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd934x_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd934x_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "snd-soc-wcd934x.ko"
   }
   dest_file: "debug_api/snd-soc-wcd934x.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd9xxx_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd9xxx_ko.asciipb
index 63e253917..162f16230 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd9xxx_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_snd-soc-wcd9xxx_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "snd-soc-wcd9xxx.ko"
   }
   dest_file: "debug_api/snd-soc-wcd9xxx.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_videobuf2-memops_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_videobuf2-memops_ko.asciipb
index 1823ef56e..45d55016e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_videobuf2-memops_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_videobuf2-memops_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "debug_api/videobuf2-memops.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_videobuf2-vmalloc_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_videobuf2-vmalloc_ko.asciipb
index ebeedfdab..5cf296267 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_videobuf2-vmalloc_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_videobuf2-vmalloc_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "debug_api/videobuf2-vmalloc.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd-core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd-core_ko.asciipb
index 65613ac8a..96e72817e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd-core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd-core_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "wcd-core.ko"
   }
   dest_file: "debug_api/wcd-core.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd-dsp-glink_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd-dsp-glink_ko.asciipb
index 3d5db0d3d..5257e1484 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd-dsp-glink_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wcd-dsp-glink_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "wcd-dsp-glink.ko"
   }
   dest_file: "debug_api/wcd-dsp-glink.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wlan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_api_wlan_ko.asciipb
index 7f3dab8eb..55d981aba 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,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_api"
     source_file: "wlan.ko"
   }
   dest_file: "debug_api/wlan.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_Image_lz4.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_Image_lz4.asciipb
index a3d001c0a..8afe393bd 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,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "Image.lz4"
   }
   dest_file: "debug_hang/Image.lz4"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_dtbo_img.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_dtbo_img.asciipb
index 02b8870ad..5683b5303 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,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "dtbo.img"
   }
   dest_file: "debug_hang/dtbo.img"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_ftm5_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_ftm5_ko.asciipb
index 4f2dca951..b5bcaf3be 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_ftm5_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_ftm5_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "ftm5.ko"
   }
   dest_file: "debug_hang/ftm5.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_heatmap_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_heatmap_ko.asciipb
index ef01fc78f..e7ec36b17 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_heatmap_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_heatmap_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "heatmap.ko"
   }
   dest_file: "debug_hang/heatmap.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_pinctrl-wcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_pinctrl-wcd_ko.asciipb
index 66341e1fd..0ff3e014c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_pinctrl-wcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_pinctrl-wcd_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "pinctrl-wcd.ko"
   }
   dest_file: "debug_hang/pinctrl-wcd.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm845-v2_1_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm845-v2_1_dtb.asciipb
index 20f2dc808..2c4d80079 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm845-v2_1_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm845-v2_1_dtb.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "sdm845-v2.1.dtb"
   }
   dest_file: "debug_hang/sdm845-v2.1.dtb"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm845-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm845-v2_dtb.asciipb
index 8072658d9..1494353bd 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm845-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sdm845-v2_dtb.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "sdm845-v2.dtb"
   }
   dest_file: "debug_hang/sdm845-v2.dtb"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sec_touch_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sec_touch_ko.asciipb
index e8b6243e7..dcce639fc 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sec_touch_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_sec_touch_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "sec_touch.ko"
   }
   dest_file: "debug_hang/sec_touch.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-cs35l36_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-cs35l36_ko.asciipb
index 301321016..aa237fb80 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-cs35l36_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-cs35l36_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "snd-soc-cs35l36.ko"
   }
   dest_file: "debug_hang/snd-soc-cs35l36.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-sdm845-max98927_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-sdm845-max98927_ko.asciipb
index 935ddebdc..bad131a14 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-sdm845-max98927_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-sdm845-max98927_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "snd-soc-sdm845-max98927.ko"
   }
   dest_file: "debug_hang/snd-soc-sdm845-max98927.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-sdm845_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-sdm845_ko.asciipb
index 5d3e76a0c..2049ad3a1 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-sdm845_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-sdm845_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "snd-soc-sdm845.ko"
   }
   dest_file: "debug_hang/snd-soc-sdm845.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd-spi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd-spi_ko.asciipb
index 07f0bcd31..40c300b40 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd-spi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd-spi_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "snd-soc-wcd-spi.ko"
   }
   dest_file: "debug_hang/snd-soc-wcd-spi.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd934x_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd934x_ko.asciipb
index 60232b8c2..2aca18aa2 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd934x_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd934x_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "snd-soc-wcd934x.ko"
   }
   dest_file: "debug_hang/snd-soc-wcd934x.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd9xxx_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd9xxx_ko.asciipb
index 511480451..c4769db2e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd9xxx_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_snd-soc-wcd9xxx_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "snd-soc-wcd9xxx.ko"
   }
   dest_file: "debug_hang/snd-soc-wcd9xxx.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_videobuf2-memops_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_videobuf2-memops_ko.asciipb
index 0ed740e85..2751c8ab2 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_videobuf2-memops_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_videobuf2-memops_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "debug_hang/videobuf2-memops.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_videobuf2-vmalloc_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_videobuf2-vmalloc_ko.asciipb
index 70eff013f..7446ead12 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_videobuf2-vmalloc_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_videobuf2-vmalloc_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "debug_hang/videobuf2-vmalloc.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd-core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd-core_ko.asciipb
index 58facf679..8d2a3b533 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd-core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd-core_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "wcd-core.ko"
   }
   dest_file: "debug_hang/wcd-core.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd-dsp-glink_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd-dsp-glink_ko.asciipb
index 81f4a92cf..9cd3fa519 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd-dsp-glink_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wcd-dsp-glink_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "wcd-dsp-glink.ko"
   }
   dest_file: "debug_hang/wcd-dsp-glink.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wlan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_hang_wlan_ko.asciipb
index b62b58802..c35c42296 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,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_hang"
     source_file: "wlan.ko"
   }
   dest_file: "debug_hang/wlan.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_Image_lz4.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_Image_lz4.asciipb
index 81a216618..e5a685778 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,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "Image.lz4"
   }
   dest_file: "debug_locking/Image.lz4"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_dtbo_img.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_dtbo_img.asciipb
index b9f424bcd..ec4e0c698 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,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "dtbo.img"
   }
   dest_file: "debug_locking/dtbo.img"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_ftm5_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_ftm5_ko.asciipb
index 01a0a164f..fce680365 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_ftm5_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_ftm5_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "ftm5.ko"
   }
   dest_file: "debug_locking/ftm5.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_heatmap_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_heatmap_ko.asciipb
index 0c223fc20..3d6972e49 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_heatmap_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_heatmap_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "heatmap.ko"
   }
   dest_file: "debug_locking/heatmap.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_pinctrl-wcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_pinctrl-wcd_ko.asciipb
index ace028a89..72e9e539f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_pinctrl-wcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_pinctrl-wcd_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "pinctrl-wcd.ko"
   }
   dest_file: "debug_locking/pinctrl-wcd.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm845-v2_1_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm845-v2_1_dtb.asciipb
index b8491b16b..0459ecb64 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm845-v2_1_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm845-v2_1_dtb.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "sdm845-v2.1.dtb"
   }
   dest_file: "debug_locking/sdm845-v2.1.dtb"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm845-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm845-v2_dtb.asciipb
index 2b8475dff..a1f98d9e2 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm845-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sdm845-v2_dtb.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "sdm845-v2.dtb"
   }
   dest_file: "debug_locking/sdm845-v2.dtb"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sec_touch_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sec_touch_ko.asciipb
index a48b5a44a..998726688 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sec_touch_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_sec_touch_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "sec_touch.ko"
   }
   dest_file: "debug_locking/sec_touch.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-cs35l36_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-cs35l36_ko.asciipb
index 6da7d6180..4477af41a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-cs35l36_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-cs35l36_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "snd-soc-cs35l36.ko"
   }
   dest_file: "debug_locking/snd-soc-cs35l36.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-sdm845-max98927_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-sdm845-max98927_ko.asciipb
index c5dfce8b9..457872805 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-sdm845-max98927_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-sdm845-max98927_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "snd-soc-sdm845-max98927.ko"
   }
   dest_file: "debug_locking/snd-soc-sdm845-max98927.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-sdm845_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-sdm845_ko.asciipb
index 0f3a80c40..ecd563092 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-sdm845_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-sdm845_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "snd-soc-sdm845.ko"
   }
   dest_file: "debug_locking/snd-soc-sdm845.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd-spi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd-spi_ko.asciipb
index 4909875b7..9f19c3e44 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd-spi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd-spi_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "snd-soc-wcd-spi.ko"
   }
   dest_file: "debug_locking/snd-soc-wcd-spi.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd934x_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd934x_ko.asciipb
index bc51cf0b8..100ce8b0d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd934x_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd934x_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "snd-soc-wcd934x.ko"
   }
   dest_file: "debug_locking/snd-soc-wcd934x.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd9xxx_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd9xxx_ko.asciipb
index b0a1f69ac..a6a9bd60d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd9xxx_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_snd-soc-wcd9xxx_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "snd-soc-wcd9xxx.ko"
   }
   dest_file: "debug_locking/snd-soc-wcd9xxx.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_videobuf2-memops_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_videobuf2-memops_ko.asciipb
index c2ea302b0..ae27c508d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_videobuf2-memops_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_videobuf2-memops_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "debug_locking/videobuf2-memops.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_videobuf2-vmalloc_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_videobuf2-vmalloc_ko.asciipb
index d0909fa13..ab4d73b4d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_videobuf2-vmalloc_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_videobuf2-vmalloc_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "debug_locking/videobuf2-vmalloc.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd-core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd-core_ko.asciipb
index 9981ff37a..af19c8e03 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd-core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd-core_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "wcd-core.ko"
   }
   dest_file: "debug_locking/wcd-core.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd-dsp-glink_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd-dsp-glink_ko.asciipb
index 9115a8927..6229025bd 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd-dsp-glink_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wcd-dsp-glink_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "wcd-dsp-glink.ko"
   }
   dest_file: "debug_locking/wcd-dsp-glink.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wlan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_locking_wlan_ko.asciipb
index 724c056c0..c9d18d518 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,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_locking"
     source_file: "wlan.ko"
   }
   dest_file: "debug_locking/wlan.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_Image_lz4.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_Image_lz4.asciipb
index 1adcf5ce8..34389d829 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,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "Image.lz4"
   }
   dest_file: "debug_memory/Image.lz4"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_dtbo_img.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_dtbo_img.asciipb
index bec5229e9..0e5513075 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,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "dtbo.img"
   }
   dest_file: "debug_memory/dtbo.img"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_ftm5_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_ftm5_ko.asciipb
index bfc53b0af..519da0fcf 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_ftm5_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_ftm5_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "ftm5.ko"
   }
   dest_file: "debug_memory/ftm5.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_heatmap_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_heatmap_ko.asciipb
index 0c18bc9e7..0ed2eb7b5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_heatmap_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_heatmap_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "heatmap.ko"
   }
   dest_file: "debug_memory/heatmap.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_pinctrl-wcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_pinctrl-wcd_ko.asciipb
index f62fe818a..5bf061bec 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_pinctrl-wcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_pinctrl-wcd_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "pinctrl-wcd.ko"
   }
   dest_file: "debug_memory/pinctrl-wcd.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm845-v2_1_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm845-v2_1_dtb.asciipb
index 97ff1ff7c..df3bc5d3b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm845-v2_1_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm845-v2_1_dtb.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "sdm845-v2.1.dtb"
   }
   dest_file: "debug_memory/sdm845-v2.1.dtb"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm845-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm845-v2_dtb.asciipb
index 37ab1e023..965021fd4 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm845-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sdm845-v2_dtb.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "sdm845-v2.dtb"
   }
   dest_file: "debug_memory/sdm845-v2.dtb"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sec_touch_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sec_touch_ko.asciipb
index 7d247b008..26a57e6ea 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sec_touch_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_sec_touch_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "sec_touch.ko"
   }
   dest_file: "debug_memory/sec_touch.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-cs35l36_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-cs35l36_ko.asciipb
index f65ea7eea..0f244a301 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-cs35l36_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-cs35l36_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "snd-soc-cs35l36.ko"
   }
   dest_file: "debug_memory/snd-soc-cs35l36.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-sdm845-max98927_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-sdm845-max98927_ko.asciipb
index dc88da227..60bbf1cab 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-sdm845-max98927_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-sdm845-max98927_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "snd-soc-sdm845-max98927.ko"
   }
   dest_file: "debug_memory/snd-soc-sdm845-max98927.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-sdm845_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-sdm845_ko.asciipb
index 007bb0ab7..beb00aae5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-sdm845_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-sdm845_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "snd-soc-sdm845.ko"
   }
   dest_file: "debug_memory/snd-soc-sdm845.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd-spi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd-spi_ko.asciipb
index ecf9d0e45..d73a2893f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd-spi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd-spi_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "snd-soc-wcd-spi.ko"
   }
   dest_file: "debug_memory/snd-soc-wcd-spi.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd934x_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd934x_ko.asciipb
index 753bfd907..408a29ee9 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd934x_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd934x_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "snd-soc-wcd934x.ko"
   }
   dest_file: "debug_memory/snd-soc-wcd934x.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd9xxx_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd9xxx_ko.asciipb
index 6951708e1..bc776b4fa 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd9xxx_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_snd-soc-wcd9xxx_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "snd-soc-wcd9xxx.ko"
   }
   dest_file: "debug_memory/snd-soc-wcd9xxx.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_videobuf2-memops_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_videobuf2-memops_ko.asciipb
index 0fa2f98f5..cfced6f7f 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_videobuf2-memops_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_videobuf2-memops_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "debug_memory/videobuf2-memops.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_videobuf2-vmalloc_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_videobuf2-vmalloc_ko.asciipb
index e2b18abfe..25feffda3 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_videobuf2-vmalloc_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_videobuf2-vmalloc_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "debug_memory/videobuf2-vmalloc.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd-core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd-core_ko.asciipb
index 0d5c87b60..4ef82b65e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd-core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd-core_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "wcd-core.ko"
   }
   dest_file: "debug_memory/wcd-core.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd-dsp-glink_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd-dsp-glink_ko.asciipb
index 910f33168..74ff5b097 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd-dsp-glink_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wcd-dsp-glink_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "wcd-dsp-glink.ko"
   }
   dest_file: "debug_memory/wcd-dsp-glink.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wlan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_debug_memory_wlan_ko.asciipb
index 05373de51..e912724cc 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,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_debug_memory"
     source_file: "wlan.ko"
   }
   dest_file: "debug_memory/wlan.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_dtbo_img.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_dtbo_img.asciipb
index 91600041b..97f467902 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_dtbo_img.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_dtbo_img.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "dtbo.img"
   }
   dest_file: "dtbo.img"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_ftm5_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_ftm5_ko.asciipb
index 8f8e86ca9..698fe5592 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_ftm5_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_ftm5_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "ftm5.ko"
   }
   dest_file: "ftm5.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_heatmap_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_heatmap_ko.asciipb
index 3b6b8c17b..0fdbd90ba 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_heatmap_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_heatmap_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "heatmap.ko"
   }
   dest_file: "heatmap.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_Image_lz4.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_Image_lz4.asciipb
index 82cbc615d..f91170df9 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,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "Image.lz4"
   }
   dest_file: "kasan/Image.lz4"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_dtbo_img.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_dtbo_img.asciipb
index 3ceba8fec..d6a534031 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,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "dtbo.img"
   }
   dest_file: "kasan/dtbo.img"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_ftm5_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_ftm5_ko.asciipb
index 76c08acee..6b10e2af6 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_ftm5_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_ftm5_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "ftm5.ko"
   }
   dest_file: "kasan/ftm5.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_heatmap_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_heatmap_ko.asciipb
index baeb14a73..5998196ad 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_heatmap_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_heatmap_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "heatmap.ko"
   }
   dest_file: "kasan/heatmap.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_pinctrl-wcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_pinctrl-wcd_ko.asciipb
index fc1e3b4ca..b1385c76b 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_pinctrl-wcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_pinctrl-wcd_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "pinctrl-wcd.ko"
   }
   dest_file: "kasan/pinctrl-wcd.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm845-v2_1_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm845-v2_1_dtb.asciipb
index 840664c29..d5624579a 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm845-v2_1_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm845-v2_1_dtb.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "sdm845-v2.1.dtb"
   }
   dest_file: "kasan/sdm845-v2.1.dtb"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm845-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm845-v2_dtb.asciipb
index 916bc17f3..b3fbcd12c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm845-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sdm845-v2_dtb.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "sdm845-v2.dtb"
   }
   dest_file: "kasan/sdm845-v2.dtb"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sec_touch_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sec_touch_ko.asciipb
index 12c3aefe3..7a49469e0 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sec_touch_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_sec_touch_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "sec_touch.ko"
   }
   dest_file: "kasan/sec_touch.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-cs35l36_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-cs35l36_ko.asciipb
index bfd0541e2..13f0b15f8 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-cs35l36_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-cs35l36_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "snd-soc-cs35l36.ko"
   }
   dest_file: "kasan/snd-soc-cs35l36.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-sdm845-max98927_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-sdm845-max98927_ko.asciipb
index 7a8dc189f..14c4a4181 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-sdm845-max98927_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-sdm845-max98927_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "snd-soc-sdm845-max98927.ko"
   }
   dest_file: "kasan/snd-soc-sdm845-max98927.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-sdm845_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-sdm845_ko.asciipb
index 239bbcb29..a42307e2e 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-sdm845_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-sdm845_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "snd-soc-sdm845.ko"
   }
   dest_file: "kasan/snd-soc-sdm845.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd-spi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd-spi_ko.asciipb
index 613bda728..ef725b062 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd-spi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd-spi_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "snd-soc-wcd-spi.ko"
   }
   dest_file: "kasan/snd-soc-wcd-spi.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd934x_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd934x_ko.asciipb
index 8cc030df8..22980417c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd934x_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd934x_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "snd-soc-wcd934x.ko"
   }
   dest_file: "kasan/snd-soc-wcd934x.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd9xxx_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd9xxx_ko.asciipb
index b3c10b1f7..4ef25ccf1 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd9xxx_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_snd-soc-wcd9xxx_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "snd-soc-wcd9xxx.ko"
   }
   dest_file: "kasan/snd-soc-wcd9xxx.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_test_kasan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_test_kasan_ko.asciipb
index dd0d47285..8d5f1bb86 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,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "test_kasan.ko"
   }
   dest_file: "kasan/test_kasan.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_videobuf2-memops_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_videobuf2-memops_ko.asciipb
index 9f0ea2ffd..6243f7ff3 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_videobuf2-memops_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_videobuf2-memops_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "kasan/videobuf2-memops.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_videobuf2-vmalloc_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_videobuf2-vmalloc_ko.asciipb
index 1a28c73e5..8a19988c7 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_videobuf2-vmalloc_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_videobuf2-vmalloc_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "kasan/videobuf2-vmalloc.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd-core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd-core_ko.asciipb
index 0467f5a34..7925d4471 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd-core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd-core_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "wcd-core.ko"
   }
   dest_file: "kasan/wcd-core.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd-dsp-glink_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd-dsp-glink_ko.asciipb
index a2cc5debb..badb337ef 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd-dsp-glink_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wcd-dsp-glink_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "wcd-dsp-glink.ko"
   }
   dest_file: "kasan/wcd-dsp-glink.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wlan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_kasan_wlan_ko.asciipb
index 67b7fa2f7..9acb96244 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,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross_kasan"
     source_file: "wlan.ko"
   }
   dest_file: "kasan/wlan.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_pinctrl-wcd_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_pinctrl-wcd_ko.asciipb
index 2053942bd..7ae5a4fe4 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_pinctrl-wcd_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_pinctrl-wcd_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "pinctrl-wcd.ko"
   }
   dest_file: "pinctrl-wcd.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm845-v2_1_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm845-v2_1_dtb.asciipb
index e9dbbf4cc..c073a2aba 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm845-v2_1_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm845-v2_1_dtb.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "sdm845-v2.1.dtb"
   }
   dest_file: "sdm845-v2.1.dtb"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm845-v2_dtb.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm845-v2_dtb.asciipb
index fd13d7dac..f7358508d 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm845-v2_dtb.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_sdm845-v2_dtb.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "sdm845-v2.dtb"
   }
   dest_file: "sdm845-v2.dtb"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_sec_touch_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_sec_touch_ko.asciipb
index 4b9bff6e2..de35dc127 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_sec_touch_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_sec_touch_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "sec_touch.ko"
   }
   dest_file: "sec_touch.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-cs35l36_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-cs35l36_ko.asciipb
index 8b41458e6..94921ce6c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-cs35l36_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-cs35l36_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "snd-soc-cs35l36.ko"
   }
   dest_file: "snd-soc-cs35l36.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-sdm845-max98927_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-sdm845-max98927_ko.asciipb
index cb666212a..6068df1e5 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-sdm845-max98927_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-sdm845-max98927_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "snd-soc-sdm845-max98927.ko"
   }
   dest_file: "snd-soc-sdm845-max98927.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-sdm845_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-sdm845_ko.asciipb
index c160bfd7d..006522e57 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-sdm845_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-sdm845_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "snd-soc-sdm845.ko"
   }
   dest_file: "snd-soc-sdm845.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd-spi_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd-spi_ko.asciipb
index fb101222f..eaba99e15 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd-spi_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd-spi_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "snd-soc-wcd-spi.ko"
   }
   dest_file: "snd-soc-wcd-spi.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd934x_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd934x_ko.asciipb
index 3c1b5dde3..b7caedf3c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd934x_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd934x_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "snd-soc-wcd934x.ko"
   }
   dest_file: "snd-soc-wcd934x.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd9xxx_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd9xxx_ko.asciipb
index 955efb8fc..f32fd04e3 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd9xxx_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_snd-soc-wcd9xxx_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "snd-soc-wcd9xxx.ko"
   }
   dest_file: "snd-soc-wcd9xxx.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_videobuf2-memops_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_videobuf2-memops_ko.asciipb
index d10e3662f..580f1a6ca 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_videobuf2-memops_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_videobuf2-memops_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "videobuf2-memops.ko"
   }
   dest_file: "videobuf2-memops.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_videobuf2-vmalloc_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_videobuf2-vmalloc_ko.asciipb
index 58dffcf8a..7a1e8f148 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_videobuf2-vmalloc_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_videobuf2-vmalloc_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "videobuf2-vmalloc.ko"
   }
   dest_file: "videobuf2-vmalloc.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd-core_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd-core_ko.asciipb
index fb49f6d71..39c5d984c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd-core_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd-core_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "wcd-core.ko"
   }
   dest_file: "wcd-core.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd-dsp-glink_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd-dsp-glink_ko.asciipb
index 4d97f35d7..a09fcd09c 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd-dsp-glink_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_wcd-dsp-glink_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "wcd-dsp-glink.ko"
   }
   dest_file: "wcd-dsp-glink.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }
diff --git a/.prebuilt_info/kernel-and-modules/prebuilt_info_wlan_ko.asciipb b/.prebuilt_info/kernel-and-modules/prebuilt_info_wlan_ko.asciipb
index 4cd76f93e..87548e717 100644
--- a/.prebuilt_info/kernel-and-modules/prebuilt_info_wlan_ko.asciipb
+++ b/.prebuilt_info/kernel-and-modules/prebuilt_info_wlan_ko.asciipb
@@ -1,11 +1,11 @@
 drops {
   android_build_drop {
-    build_id: "7341514"
+    build_id: "7425221"
     target: "kernel_bluecross"
     source_file: "wlan.ko"
   }
   dest_file: "wlan.ko"
-  version: "Linux version 4.9.248-ga11f008926d6-ab7341514 (android-build@abfarm-us-east1-c-0083) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Thu May 6 10:16:43 UTC 2021"
+  version: "Linux version 4.9.248-gc4689af91bc5-ab7425221 (android-build@abfarm626) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Fri Jun 4 06:01:28 UTC 2021"
   version_group: "kernel-and-modules"
   git_project: "device/google/crosshatch-kernel"
 }