Add multichannel support am: c678d51bdc am: 5de1ae23f9 am: e0c3d0c3fd
authorPawin Vongmasa <pawin@google.com>
Thu, 24 May 2018 22:38:36 +0000 (15:38 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 May 2018 22:38:36 +0000 (15:38 -0700)
am: 006436f92f

Change-Id: I6aeba2a72185c08a15dc96468bfe6c4c45410d52


Trivial merge