Merge branches 'x86/asm', 'x86/cleanups' and 'x86/headers' into x86/core