Merge "Revert "Remove USE_XML_AUDIO_POLICY_CONF build flag"" am: 16a29d84fa
am: c26d854e41

Change-Id: Ie469265d8be34aa0e62f3724b1448c43097ebee4
diff --git a/device-common.mk b/device-common.mk
index 87f3dd9..938322c 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -221,6 +221,7 @@
         $(LOCAL_PATH)/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf
 
 # audio policy configuration
+USE_XML_AUDIO_POLICY_CONF := 1
 PRODUCT_COPY_FILES += \
     device/linaro/hikey/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \