diff --git a/tensorflow/lite/examples/label_image/label_image.cc b/tensorflow/lite/examples/label_image/label_image.cc
index a75b207a072..fe3d4cf9f09 100644
--- a/tensorflow/lite/examples/label_image/label_image.cc
+++ b/tensorflow/lite/examples/label_image/label_image.cc
@@ -103,11 +103,7 @@ TfLiteDelegatePtrMap GetDelegates(Settings* s) {
   }
 
   if (s->xnnpack_delegate) {
-    TfLiteXNNPackDelegateOptions xnnpack_options =
-        TfLiteXNNPackDelegateOptionsDefault();
-    xnnpack_options.num_threads = s->number_of_threads;
-
-    auto delegate = evaluation::CreateXNNPACKDelegate(&xnnpack_options);
+    auto delegate = evaluation::CreateXNNPACKDelegate(s->number_of_threads);
     if (!delegate) {
       LOG(INFO) << "XNNPACK acceleration is unsupported on this platform.";
     } else {
diff --git a/third_party/cpuinfo/BUILD.bazel b/third_party/cpuinfo/BUILD.bazel
index 70cfa6c0359..1a8557a89be 100644
--- a/third_party/cpuinfo/BUILD.bazel
+++ b/third_party/cpuinfo/BUILD.bazel
@@ -96,10 +96,9 @@ MACH_ARM_SRCS = [
 cc_library(
     name = "cpuinfo_impl",
     srcs = select({
-        ":linux_aarch64": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM64_SRCS,
-        ":linux_arm": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM32_SRCS,
         ":linux_x86_64": COMMON_SRCS + X86_SRCS + LINUX_SRCS + LINUX_X86_SRCS,
         ":linux_aarch64": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM64_SRCS,
+        ":linux_arm": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM32_SRCS,
         ":macos_x86_64": COMMON_SRCS + X86_SRCS + MACH_SRCS + MACH_X86_SRCS,
         ":android_armv7": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM32_SRCS + ANDROID_ARM_SRCS,
         ":android_arm64": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM64_SRCS + ANDROID_ARM_SRCS,
@@ -159,18 +158,6 @@ cc_library(
 
 ############################# Build configurations #############################
 
-config_setting(
-    name = "linux_aarch64",
-    values = {"cpu": "aarch64"},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "linux_arm",
-    values = {"cpu": "arm"},
-    visibility = ["//visibility:public"],
-)
-
 config_setting(
     name = "linux_x86_64",
     values = {"cpu": "k8"},
@@ -181,6 +168,12 @@ config_setting(
     values = {"cpu": "aarch64"},
 )
 
+config_setting(
+    name = "linux_arm",
+    values = {"cpu": "arm"},
+    visibility = ["//visibility:public"],
+)
+
 config_setting(
     name = "macos_x86_64",
     values = {