Merge "Separate java stdio from native stdio"