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

Change-Id: I56c60a4c66b0be80006ae15de0f873c442f9b396