zenfone6: Update audio_policy_configuration from ZS630KL specific config

Change-Id: Ia8966d52e298f92e4fefe08448d1ef4effca0f59
diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index 2de9a70..1948a4a 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -60,7 +60,7 @@
             <defaultOutputDevice>Speaker</defaultOutputDevice>
             <mixPorts>
                 <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_PRIMARY">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="raw" role="source"
@@ -409,7 +409,7 @@
 
     <!-- Volume section -->
 
-    <xi:include href="/vendor/etc/audio_policy_volumes.xml"/>
+    <xi:include href="/vendor/etc/audio_policy_volumes_ZS630KL.xml"/>
     <xi:include href="/vendor/etc/default_volume_tables.xml"/>
 
     <!-- End of Volume section -->