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

Change-Id: I83723322bfd4db3290fd831210ba1fc03c51e22a