Merge changes I7835e753,I5fe4d3e7

* changes:
  AudioPolicyManager: abort when client is removed while active
  AudioOutputDescriptor: improve refcount logging