Merge "Remove USE_XML_AUDIO_POLICY_CONF build flag"
am: 23a08f7dc5

Change-Id: I8a55fa0ddf155ad0f9a57d421a4eed6fc09eeb9f