am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread

* commit '2bf89b2197674ccc414ea60a61199562df9dc52b':
  Expose AMRNB/WB and AAC encoder and related file output formats - do not merge