Merge "Convert libaaudio to Android.bp" am: c1314e4423
am: 8581000b88  -s ours

Change-Id: Ic88a21ff2975113d0259b4c27cd381ebe8884ba0