Merge "libeffects: Extend benchmarks to test up to 24 channels" am: b208216c0d am: ff651935a2 am: 32c84c1381

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77cb97a2c1025934933a736f17dd1157c97d983d