Merge "Add FdFile::Compare"