Merge "g711 channel count limits"
am: e17f0c1c1e

Change-Id: I44fc3c92c51f1e83f304a86b5f81d23d6eed9b8d