Merge "Use aidl_library in cc libraries" am: 5e7011bc am: 25a7557b

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



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