Merge changes I750f5d18,If517cc3f

* changes:
  libAudioHal: factorize V2 and V4
  Align LibAudioHal V2 and V4 for factorisation