Merge "Apply cosmetic changes to String.java from OpenJDK 8u121-b13"