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

Change-Id: I9dc2888c9ad696bf71905616c49ca8b26d8ea341