diff --git a/neuralnetworks/1.0/utils/Android.bp b/neuralnetworks/1.0/utils/Android.bp
index 8c51c67..0ad9926 100644
--- a/neuralnetworks/1.0/utils/Android.bp
+++ b/neuralnetworks/1.0/utils/Android.bp
@@ -44,7 +44,6 @@
 
 cc_test {
     name: "neuralnetworks_utils_hal_1_0_test",
-    host_supported: true,
     srcs: ["test/*.cpp"],
     static_libs: [
         "android.hardware.neuralnetworks@1.0",
@@ -63,12 +62,8 @@
         "libhidlbase",
         "libhidlmemory",
         "liblog",
+        "libnativewindow",
         "libutils",
     ],
-    target: {
-        android: {
-            shared_libs: ["libnativewindow"],
-        },
-    },
     test_suites: ["general-tests"],
 }
diff --git a/neuralnetworks/1.0/vts/functional/Android.bp b/neuralnetworks/1.0/vts/functional/Android.bp
index b33c581..9a91560 100644
--- a/neuralnetworks/1.0/vts/functional/Android.bp
+++ b/neuralnetworks/1.0/vts/functional/Android.bp
@@ -25,10 +25,19 @@
 
 cc_defaults {
     name: "neuralnetworks_vts_functional_defaults",
-    defaults: [
-        "VtsHalTargetTestDefaults",
-        "neuralnetworks_float16",
-    ],
+    defaults: ["VtsHalTargetTestDefaults"],
+    arch: {
+        x86: {
+            cflags: [ "-D_Float16=__fp16",
+                      "-Xclang", "-fnative-half-type",
+                      "-Xclang", "-fallow-half-arguments-and-returns" ],
+        },
+        x86_64: {
+            cflags: [ "-D_Float16=__fp16",
+                      "-Xclang", "-fnative-half-type",
+                      "-Xclang", "-fallow-half-arguments-and-returns" ],
+        },
+    },
 }
 
 cc_library_static {
@@ -74,7 +83,6 @@
         "libnativewindow",
     ],
     static_libs: [
-        "VtsHalNeuralNetworksV1_0_utils",
         "android.hardware.neuralnetworks@1.0",
         "android.hidl.allocator@1.0",
         "android.hidl.memory@1.0",
@@ -82,6 +90,7 @@
         "libhidlmemory",
         "libneuralnetworks_generated_test_harness",
         "libneuralnetworks_utils",
+        "VtsHalNeuralNetworksV1_0_utils",
     ],
     whole_static_libs: [
         "neuralnetworks_generated_V1_0_example",
@@ -89,8 +98,5 @@
     header_libs: [
         "libneuralnetworks_headers",
     ],
-    test_suites: [
-        "general-tests",
-        "vts",
-    ],
+    test_suites: ["general-tests", "vts"],
 }