Merge "Allow codec2/g711 codec to handle 6 channels" into qt-qpr1-dev
am: 2cf0953b4e

Change-Id: I0af77bbc7d1ddb2c05837e2ce6d6c03930392ca9