x86: use logical apicid in x2apic_cluster's x2apic_cpu_mask_to_apicid_and()