Merge "Remove gcc warning about redefinition of putchar with different visibility"