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

Change-Id: I349653bf0a14765bc9b66cff5e68069c0102d4b8