am a60337ce: am 6bb14e08: Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread

Merge commit 'a60337ce578f91926a5e8ea30cb47740b994fc96'

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