Merge "libeffects: SUPPORT_MC macro clean up" am: 313207359a

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

Change-Id: I6a0cad126d70cc11af8e5e4c5172ca6d42762e63