Merge "Convert Android.mk in libaudioclient to Android.bp"