Merge "Remove framework_native_aidl and use its child filegroups directly"