am e436ef09: am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread

Merge commit 'e436ef09d205eee473d5a4a4d0a1721b8dfbe193'

* commit 'e436ef09d205eee473d5a4a4d0a1721b8dfbe193':
  Another attempt for fixing AAC+/eAAC+ related issue