diff --git a/libbfqio/Android.bp b/libbfqio/Android.bp
index dd816293..d9a7edbe 100644
--- a/libbfqio/Android.bp
+++ b/libbfqio/Android.bp
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2017 The LineageOS Project
+// Copyright (C) 2017-2019 The LineageOS Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,8 +20,9 @@ cc_library_headers {
     export_include_dirs: ["include"],
 }
 
-cc_defaults {
-    name: "libbfqio_defaults",
+cc_library {
+    name: "libbfqio",
+    vendor_available: true,
     srcs: [
         "bfqio.c",
     ],
@@ -41,15 +42,3 @@ cc_defaults {
         "-Wextra",
     ],
 }
-
-cc_library {
-    name: "libbfqio",
-    vendor_available: true,
-    defaults: ["libbfqio_defaults"],
-}
-
-cc_library {
-    name: "libbfqio_vendor",
-    vendor: true,
-    defaults: ["libbfqio_defaults"],
-}