Merge remote-tracking branch 'origin/stdio' into maks/stdio

Fix up minor conflicts in:
	usr/include/stdio.h
	usr/klibc/Kbuild