Audio: 8916 Audio HAL bringup changes

- Remove 8916 platform specific folder

- use common platform specific files for
  B family & 8916 targets

Change-Id: Icdc20fa289d3aaa2080346e1305b0faec1bbd233
diff --git a/hal/Android.mk b/hal/Android.mk
index 1f23f04..1c3f946 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -8,7 +8,7 @@
 
 AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
 
-ifneq ($(filter msm8974 msm8226 msm8610 apq8084,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8974 msm8226 msm8610 apq8084 msm8916,$(TARGET_BOARD_PLATFORM)),)
   # B-family platform uses msm8974 code base
   AUDIO_PLATFORM = msm8974
   MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -23,11 +23,6 @@
 endif
 endif
 
-ifneq ($(filter msm8916,$(TARGET_BOARD_PLATFORM)),)
-  AUDIO_PLATFORM = msm8916
-  MULTIPLE_HW_VARIANTS_ENABLED := true
-  LOCAL_CFLAGS := -DPLATFORM_MSM8916
-endif
 
 LOCAL_SRC_FILES := \
 	audio_hw.c \