Merge "Reformat java.nio.charset classes to match 8u121-b13"