Merge "The x86_64 kernel headers are the x86 kernel headers."