find7a: Switch caf variant to -bfam

Also comment out a bunch of items that most likely can be removed
on msm8974

Change-Id: I52b1b735f66c13d0b3235dfd5672690125657827
diff --git a/BoardConfig.mk b/BoardConfig.mk
index c3c73a4..990370b 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -48,7 +48,7 @@
 COMMON_GLOBAL_CFLAGS += -DQCOM_HARDWARE -DQCOM_BSP
 
 # Display
-TARGET_QCOM_DISPLAY_VARIANT := caf
+TARGET_QCOM_DISPLAY_VARIANT := caf-bfam
 USE_OPENGL_RENDERER := true
 TARGET_USES_ION := true
 TARGET_USES_C2D_COMPOSITION := true
@@ -56,18 +56,18 @@
 
 # Audio/media
 BOARD_USES_ALSA_AUDIO:= true
-TARGET_QCOM_AUDIO_VARIANT := caf
+TARGET_QCOM_AUDIO_VARIANT := caf-bfam
 BOARD_HAVE_LOW_LATENCY_AUDIO := true
-TARGET_QCOM_MEDIA_VARIANT := caf
-BOARD_USES_FLUENCE_INCALL := true
-BOARD_USES_FLUENCE_FOR_VOIP := true
+TARGET_QCOM_MEDIA_VARIANT := caf-bfam
+#BOARD_USES_FLUENCE_INCALL := true
+#BOARD_USES_FLUENCE_FOR_VOIP := true
 # maxwen: this is actually only needed because
 # of a bug in audio-caf when BOARD_USES_FLUENCE_INCALL := true
 # to enter the default else path
-BOARD_USES_SEPERATED_AUDIO_INPUT := true
-BOARD_USES_SEPERATED_VOICE_SPEAKER := true
-BOARD_HAVE_NEW_QCOM_CSDCLIENT := true
-BOARD_USES_SEPERATED_HEADSET_MIC := true
+#BOARD_USES_SEPERATED_AUDIO_INPUT := true
+#BOARD_USES_SEPERATED_VOICE_SPEAKER := true
+#BOARD_HAVE_NEW_QCOM_CSDCLIENT := true
+#BOARD_USES_SEPERATED_HEADSET_MIC := true
 
 # Camera
 COMMON_GLOBAL_CFLAGS += -DNEEDS_VECTORIMPL_SYMBOLS