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

Change-Id: Icbe7447c6f3cf0b6cf38667ad1e0448fd4c66ac6