am 4c9cd95b: Merge "Added support for HE-AAC recording" into jb-dev

* commit '4c9cd95b27a638701be2ffa1713273ba2f624770':
  Added support for HE-AAC recording