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

Change-Id: Ie469265d8be34aa0e62f3724b1448c43097ebee4