Merge "AAC C2 decoder: add channel mask in output format change" into tm-dev