Merge "CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO" am: b11bf3f70c
am: 491233c403

* commit '491233c403a2ecc2532cd44fd2d9e9629b3c4bbd':
  CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO