Merge "AACWriter: support all possible channel counts"