hal: Disable perf boost by default

 * This isn't really gaining us anything besides higher power
   consumption. Disable it by default. If another 8974 needs
   this then they can opt-in.

Change-Id: Ief9a68b3a2149d6190c9f27eccabb5a471d8908c
diff --git a/hal/Android.mk b/hal/Android.mk
index 3d50a25..24af2dc 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -23,7 +23,6 @@
 endif
 ifneq ($(filter msm8974,$(TARGET_BOARD_PLATFORM)),)
   LOCAL_CFLAGS := -DPLATFORM_MSM8974
-  LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED
 endif
 endif
 
@@ -172,6 +171,10 @@
     LOCAL_CFLAGS += -DLOW_LATENCY_CAPTURE_USE_CASE=1
 endif
 
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE)),true)
+    LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED
+endif
+
 LOCAL_SHARED_LIBRARIES := \
 	liblog \
 	libcutils \
@@ -192,7 +195,7 @@
 	$(LOCAL_PATH)/$(AUDIO_PLATFORM) \
 	$(LOCAL_PATH)/audio_extn \
 	$(LOCAL_PATH)/voice_extn \
-        $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
+	$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 
 ifeq ($(strip $(AUDIO_FEATURE_ENABLED_LISTEN)),true)
     LOCAL_CFLAGS += -DAUDIO_LISTEN_ENABLED