Merge "Allow AIDL interfaces in service parsing"