Merge changes I4dde722b,Ic24860a2 into audio-userspace.lnx.2.2-dev

* changes:
  mm-audio: aac: modify aac encoding test app
  mm-audio: aac: modify aac encoding test app