Merge "ART: Add Unlink to FdFile"
am: eaf7488446

Change-Id: Ic5cedb17b46c453d572c8dc76aea52d38d4a28c1