Merge "Clean up some <stdio.h> constants." am: 7f86f1dd am: 84136f4b am: a67457ed am: bb55a6f7 am: 54ee0025 Change-Id: Ia26324faeba88c81d990c82bfac4a8bb4a08ca02