Merge "EffectDownmix: Remove obsolete define" am: a4c95a851c am: fe2a40564c

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

Change-Id: If731031bb297958cee793e9a0f07c6e83f3c8224