Merge "Add the definitions as to 3ch and 4ch audio"
am: 22831131c9

Change-Id: Id0c8450344f654b6baaa1899cac71f75114f8974