am 4e47988f: Merge "Remove macros putc*/getc* from API<21 stdio.h to use"

* commit '4e47988faed03f8ab525cc91f82213c2c9d59120':
  Remove macros putc*/getc* from API<21 stdio.h to use