Merge "Add a filegroup for AIDL files in frameworks/native/aidl"