Revert^2 "Add channel layout for 13.0"

This reverts commit efca6853ede8967c0ce192c5f031bced012d0db8.

Reason for revert: test fixed

Change-Id: I833be820f2c18555aa409ad24a0610f3369bfa95
2 files changed