Merge "Revert Android changes in PrintStream.java on top of OpenJDK8u121-b13."