Merge "Add Base64 from OpenJDK 8u60"