Merge commit 'a60337ce578f91926a5e8ea30cb47740b994fc96' * commit 'a60337ce578f91926a5e8ea30cb47740b994fc96': Enable the support for decoding audio with AAC+ and eAAC+ features
Merge commit 'a60337ce578f91926a5e8ea30cb47740b994fc96' * commit 'a60337ce578f91926a5e8ea30cb47740b994fc96': Enable the support for decoding audio with AAC+ and eAAC+ features