Merge changes I3e3cbc53,I2a1828d9

* changes:
  Spatializer: enforce only one client registered
  audio policy service: fix spatializer locking scheme