Merge "Replace filegroup with aidl_library module type"