Merge "libeffects: Add multichannel support to Reverb" am: ba88b6bfd1 am: 6a715cf983

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1396509

Change-Id: Ic5e9d14519f1942a42613b83084c053cb8ca05db