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

Change-Id: Ic56a141a6ffad9c0080ac3d942d2b669f8ca37d5