[automerger skipped] libaudiohal@aidl: Refactor Android.bp files and reformat...

[automerger skipped] libaudiohal@aidl: Refactor Android.bp files and reformat tests am: c15834fc -s ours am: 58b28901 -s ours

am skip reason: Merged-In I5596f39268c3a67298eb13deda89f072b69b6fbb with SHA-1 7d717ec0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/23433993



Change-Id: Ie7059d499dfde1c2eb33de1045721d5c371c2d02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>