Revert "Include binderized HALs for Bluetooth and NFC"

This reverts commit dacb40f43149b911a2fcdb7cef96aa59aff02b6b.

Change-Id: I5cdfd9f8c887f694343e05bd1fea4730ba774f0e
diff --git a/device-common.mk b/device-common.mk
index 804414c..a220997 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -362,8 +362,10 @@
 PRODUCT_PACKAGES += \
     android.hardware.bluetooth@1.0-impl
 
+ifeq ($(ENABLE_TREBLE), true)
 PRODUCT_PACKAGES += \
     android.hardware.bluetooth@1.0-service
+endif
 
 # NFC packages
 PRODUCT_PACKAGES += \
@@ -371,8 +373,10 @@
     Tag  \
     android.hardware.nfc@1.0-impl
 
+ifeq ($(ENABLE_TREBLE), true)
 PRODUCT_PACKAGES += \
 	android.hardware.nfc@1.0-service
+endif
 
 # Library used for VTS tests  (only for userdebug and eng builds)
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))