Merge "Added support for HE-AAC recording" into jb-dev