Merge "Revert "Fix ODR issues in ART.""