Merge changes I24c390f6,Idc5da55c

* changes:
  libaudioprocessing: Extract vendor-available part of AudioMixer
  AudioMixer: Cleanups