Merge "force g711 test to match 1-channel sample data am: ae55cbf717 am: 9956aa2874 am: eaf3f613a9" into qt-qpr1-dev-plus-aosp
am: 3dcd55bf8d

Change-Id: I0b08d73e6f9f26f8cad3b792189810c4929192ef