Merge "support aidl bp2build changes" into main am: dec9ce66 am: 49ff8dda...

Merge "support aidl bp2build changes" into main am: dec9ce66 am: 49ff8dda am: c56fc857 am: eb0efe0d

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757771



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