Merge "libreverbwrapper: Build both static and shared libraries" am: 6430080251 am: d13082ef0b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72ff6c9780dde5b97f94b71808febe1ecfba0650