Merge "ART: Duplicate-classes cleanup"