Merge changes I0b8ae921,Ib8bda8ab

* changes:
  audiopolicy: Remove legacy audio_policy configuration
  Remove usages of USE_XML_AUDIO_POLICY_CONF