Add multichannel support am: c678d51bdc am: 9886d749d4
authorPawin Vongmasa <pawin@google.com>
Thu, 24 May 2018 17:33:18 +0000 (10:33 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 May 2018 17:33:18 +0000 (10:33 -0700)
am: b0da0bce66

Change-Id: I2b701daf2c12a7b0454c46d48910671f10ccb2b6


Trivial merge