Merge "Switch to current upstream stdio makebuf.c and setvbuf.c."