x86, apic: merge genapic.h into apic.h