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

Change-Id: I30c1b466566c8ec2d1645aca62919ecc15033ae5