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

Change-Id: I679230e9b91e5fa2325bc29b952d8a04af7e39a3