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

Change-Id: Ie7fed077481c70205b16a1050646266a80c49ba0