Merge "Support "." in cpu and arch variant names"