Merge "Revert "force g711 test to match 1-channel sample data""