Merge branch 'x86-uaccess-cleanup': x86 uaccess header cleanups