Add multichannel support

author Pawin Vongmasa <pawin@google.com>

Thu, 24 May 2018 13:57:00 +0000 (06:57 -0700)

committer android-build-merger <android-build-merger@google.com>

Thu, 24 May 2018 13:57:00 +0000 (06:57 -0700)
author Pawin Vongmasa <pawin@google.com>
Thu, 24 May 2018 13:57:00 +0000 (06:57 -0700)
committer android-build-merger <android-build-merger@google.com>
Thu, 24 May 2018 13:57:00 +0000 (06:57 -0700)
diff --cc media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp
Simple merge
author	Pawin Vongmasa <pawin@google.com>
	Thu, 24 May 2018 13:57:00 +0000 (06:57 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 24 May 2018 13:57:00 +0000 (06:57 -0700)