x86: merge apic_32/64.h