Revert^2 "Replace channel layout for 13.0"

This reverts commit 25e0a76221c10b64694a90ca87b9e67117f884b0.

Reason for revert: test fixed

Change-Id: I2bf7fe04db38b5ccefd3ec4194600bc0960d4fc9
4 files changed