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