um: merge arch/um/sys-{i386,x86_64}/shared