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

Change-Id: I817874e8466ae8babb1e2116ad906baa61316337