Merge "Update six more classes from java.util to OpenJDK8u60" am: 39f3deef2d am: a351ada4f9
am: 59afbebe5b

Change-Id: Idc8c23b748ac3495e3d7377b708ad0b200c4df0f