Merge "Fix ODR issues in ART."