Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread