Merge "Convert Android.mk in libaudioclient to Android.bp" am: 0da9804f12
am: 05dfbecf27

Change-Id: I855fe9d7f9d6302eda5e5f3d747a10b2d3b3b193