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

Change-Id: Ia7fd23891c93093003804adb48e9f584d225be7c