Merge "API: Update java.util.Date to OpenJDK8u60" am: a2343a7e78
am: d8d1d9682d

Change-Id: I04b50fee184ba129d986832bfadbee8325f9c56f