am 55189a0f: Merge "Switch to current upstream stdio makebuf.c and setvbuf.c."

* commit '55189a0fbd26cfd84939d9d3a42a1800a63bd2c5':
  Switch to current upstream stdio makebuf.c and setvbuf.c.