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

Change-Id: Ib2d3ae78ee7f0e76c841e40903dd26d6fad82075