Merge "libaaudioservice: Updated to build both static and shared library" am: d295e4b4bd am: 6dc4d54815 am: 2349b1a90d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ac6acaddea3c3cf932439de48b2d525fd92c5db