diff --git a/Android.bp b/Android.bp
index 731831c..b5a0580 100644
--- a/Android.bp
+++ b/Android.bp
@@ -35,6 +35,7 @@ cc_library_headers {
 
 cc_library_static {
     name: "libhevcdec",
+    defaults: ["no_bti"],
     vendor_available: true,
     host_supported: true,
 
@@ -418,7 +419,7 @@ cc_library_static {
     min_sdk_version: "29",
 }
 
-cc_test {
+cc_binary {
     name: "hevcdec",
     host_supported: true,
     cflags: [
@@ -429,7 +430,6 @@ cc_test {
         "-Wall",
         "-Werror",
     ],
-    gtest: false,
     srcs: ["test/decoder/main.c"],
     static_libs: ["libhevcdec"],
     target: {
@@ -441,6 +441,7 @@ cc_test {
 
 cc_library_static {
     name: "libhevcenc",
+    defaults: ["no_bti"],
     vendor_available: true,
     host_supported: true,
     cflags: [
@@ -805,7 +806,7 @@ cc_library_static {
     min_sdk_version: "29",
 }
 
-cc_test {
+cc_binary {
     name: "hevcenc",
     host_supported: true,
     cflags: [
@@ -814,7 +815,6 @@ cc_test {
         "-Wall",
         "-Werror",
     ],
-    gtest: false,
     srcs: ["test/encoder/main.c"],
     static_libs: ["libhevcenc"],
     sanitize: {
diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp
index 17bcca0..05ce8db 100644
--- a/fuzzer/Android.bp
+++ b/fuzzer/Android.bp
@@ -9,6 +9,10 @@ package {
 
 cc_fuzz {
     name: "hevc_dec_fuzzer",
+    //TODO: b/485868924
+    defaults: [
+        "no_bti",
+    ],
     host_supported: true,
     srcs: [
         "hevc_dec_fuzzer.cpp",
@@ -41,6 +45,10 @@ cc_fuzz {
 
 cc_fuzz {
     name: "hevc_enc_fuzzer",
+    //TODO: b/485868924
+    defaults: [
+        "no_bti",
+    ],
     host_supported: true,
     srcs: [
         "hevc_enc_fuzzer.cpp",