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