Merge "Add java.util.Base64 from OpenJDK8u60"