Merge "g711 channel count limits" into qt-aml-media-dev am: 31d9f5893d
am: ef8fed44bb

Change-Id: Id46d1f5137e5af97f432c76efe151c8b7177fd5f