Merge commit 'e5206694174d2140e662832425665ec3890fcc73' into gingerbread-plus-aosp * commit 'e5206694174d2140e662832425665ec3890fcc73': Another attempt for fixing AAC+/eAAC+ related issue
Merge commit 'e5206694174d2140e662832425665ec3890fcc73' into gingerbread-plus-aosp * commit 'e5206694174d2140e662832425665ec3890fcc73': Another attempt for fixing AAC+/eAAC+ related issue