Merge "Remove framework_native_aidl and use its child filegroups directly" am: 0bfd320f7e am: fc4f24df1f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2179777

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