Merge "Fixed the software AAC encoder" into gingerbread