Merge "Fixed the software AAC encoder" into gingerbread
tree: 72a2ee92c220db7c0d3b52dbf4ce990c68debd63
  1. camera/
  2. cmds/
  3. include/
  4. media/