Merge "Removing x86_cpuid.c."