Merge "Enable host libbcc even on unbundled builds" am: 9537e74c9f am: f41b8fd5d6

Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/libbcc/+/2268566

Change-Id: I5a458ea30a712fee31aeb01dd6574f74cc58b80d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/lib/Android.bp b/lib/Android.bp
index 7c53f60..6ddc652 100644
--- a/lib/Android.bp
+++ b/lib/Android.bp
@@ -80,13 +80,12 @@
                 "libdl",
                 "liblog",
             ],
-        },
-    },
-
-    product_variables: {
-        unbundled_build: {
-            // Don't build in unbundled branches
-            enabled: false,
+            product_variables: {
+                unbundled_build: {
+                    // Don't build in unbundled branches
+                    enabled: false,
+                },
+            },
         },
     },
 }