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

Change-Id: If508ad957671ed199bd25fba58cd9af2a261fc3a