Merge "Remove USE_XML_AUDIO_POLICY_CONF build flag" am: 23a08f7dc5 am: 71c7f86a30
am: 5eb7c1e20a

Change-Id: I0e4da38cb3270519828ac1b7da8e0a0c036d40c7