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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I157d11535acc6809e1cd19d2a87b4872416e3809