Merge changes I146430a1,I60d41eaa into qt-dev

* changes:
  audiopolicy: engineconfigurable: align with PFW unix socket convention
  audiopolicy: fix build issue by going on switching to bp