Merge "Update java.io.File to 8u60"