Merge "Update java.io.File to 8u60"
am: ec73afe366

Change-Id: I9ea5f6fc196f38cfa52b2d2b034f7d11429d40dc