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

Change-Id: I071669c86ede817a8ae4edbb4ba86c2325757763