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

Change-Id: I5f633b59e29c3d162f56309864a4a9e460815060