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

Merge "Merge "Merge "Merge "force g711 test to match 1-channel sample data" into android10-tests-dev am: 031f612a" into android11-tests-dev am: 8cce7009" into android12-tests-dev am: 7ebdc99f" into android12L-tests-dev