Merge "Adapt to usage of aspect_rules_*"