merge in oc-release history after reset to oc-dev
diff --git a/Android.mk b/Android.mk
index ce4784c..c2d1878 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,5 @@
-# adp8064 and fox box do not share BT code
-ifeq ($(filter adp8064 fox,$(TARGET_DEVICE)),)
+# TODO:  Find a better way to separate build configs for ADP vs non-ADP devices
+ifneq ($(BOARD_IS_AUTOMOTIVE),true)
   ifneq ($(filter msm8960 msm8x27 msm8226,$(TARGET_BOARD_PLATFORM)),)
     include $(call all-named-subdir-makefiles,msm8960)
   else