Merge changes I5b2973c1,Iaa535450

* changes:
  AudioFlinger: Extract inner Client class
  AudioFlinger: Use std::any for the event cookie