Merge "Add Base64 from OpenJDK 8u60" am: 63a07e80d6
am: 24bd141ce0

Change-Id: I15b2aaaf8d6791d4a561fa935c7ab960ac22c4d8