Merge \"ART: Add FdFile constructors\"
am: 2fce5cf079

Change-Id: Iba1dd0dbe494aa365dc0b6a4727a34721f2bd1d8