Merge "Provide default variant for x86."