Merge "Remove unwanted stdio symbols from android-17"