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

Change-Id: I698b3b3fb8845b33f21d59a854c6def24c0cae01