Merge "Revert "Remove USE_XML_AUDIO_POLICY_CONF build flag""