Snap for 6782803 from 7298bfa5a3101cc0c74fb2f32a53a96a806a54ef to sc-release

Change-Id: I777177fc2c0f3f7ac0035f59eb9ca55f0cd0212d
diff --git a/bcinfo/Android.bp b/bcinfo/Android.bp
index 27a10b3..c05286e 100644
--- a/bcinfo/Android.bp
+++ b/bcinfo/Android.bp
@@ -81,12 +81,6 @@
                 "libcutils",
                 "liblog",
             ],
-            product_variables: {
-                unbundled_build: {
-                    // don't build for unbundled branches
-                    enabled: false,
-                },
-            },
         },
         android: {
             shared_libs: [