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

Merge commit 'e5206694174d2140e662832425665ec3890fcc73' into gingerbread-plus-aosp

* commit 'e5206694174d2140e662832425665ec3890fcc73':
  Another attempt for fixing AAC+/eAAC+ related issue
tree: 6962c571bbee73caf0f8cea9064823d314d87c60
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/