diff --git a/Android.bp b/Android.bp
index 79e8609..7aef46b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,11 +1,3 @@
 subdirs = [
     "*"
 ]
-
-cc_defaults {
-    name: "hidl_defaults",
-    cflags: [
-        "-Wall",
-        "-Werror",
-    ],
-}
diff --git a/os_pickup.bp b/os_pickup.bp
new file mode 100644
index 0000000..c620f14
--- /dev/null
+++ b/os_pickup.bp
@@ -0,0 +1,5 @@
+// Pick up Android.bp in next directory level
+
+optional_subdirs = [
+    "*",
+]