Merge "libaaudioservice: Updated to build both static and shared library"