Merge 55c8001ced32f859bd50b0ac45e9af6062d74bab on remote branch

Change-Id: I15c36446c8b5ce69ef6a44eafab7092652317046

mem/BUILD.bazel

@@ -5,6 +5,10 @@ define_mem("pineapple", "consolidate")
 
 define_mem("pineapple", "gki")
 
+define_mem("blair", "consolidate")
+
+define_mem("blair", "gki")
+
 package(
 	default_visibility = [
 	"//visibility:public", ],

offload/BUILD.bazel

@@ -4,3 +4,7 @@ load("//build/kernel/kleaf:kernel.bzl", "ddk_module")
 define_offload("pineapple", "consolidate")
 
 define_offload("pineapple", "gki")
+
+define_offload("blair", "consolidate")
+
+define_offload("blair", "gki")

perf/BUILD.bazel

@@ -4,3 +4,7 @@ load("//build/kernel/kleaf:kernel.bzl", "ddk_module")
 define_perf("pineapple", "consolidate")
 
 define_perf("pineapple", "gki")
+
+define_perf("blair", "consolidate")
+
+define_perf("blair", "gki")

perf_tether/BUILD.bazel

@@ -4,3 +4,7 @@ load("//build/kernel/kleaf:kernel.bzl", "ddk_module")
 define_perf_tether("pineapple", "consolidate")
 
 define_perf_tether("pineapple", "gki")
+
+define_perf_tether("blair", "consolidate")
+
+define_perf_tether("blair", "gki")

shs/BUILD.bazel

@@ -3,3 +3,7 @@ load(":define_shs.bzl", "define_shs")
 define_shs("pineapple", "consolidate")
 
 define_shs("pineapple", "gki")
+
+define_shs("blair", "consolidate")
+
+define_shs("blair", "gki")

wlan/BUILD.bazel

@@ -4,3 +4,7 @@ load("//build/kernel/kleaf:kernel.bzl", "ddk_module")
 define_wlan("pineapple", "consolidate")
 
 define_wlan("pineapple", "gki")
+
+define_wlan("blair", "consolidate")
+
+define_wlan("blair", "gki")