Merge "g711 channel count limits" am: e17f0c1c1e am: 1ce3ede751

Change-Id: Ib759d159f9d176759b3ac9c59dfabcd7b4a93285