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

Change-Id: I45b828b7284e5cbe139cbf8a882258dab16479bd