Merge "Add FdFile::Compare" am: aef17bcac0 am: 5f3f87d575
am: cce086bb62

Change-Id: Id6416b3ae51a704ea1d8ea1ad22f3f125c9f1b6c