Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread