Merge "ART: Replace ScopedFd with FdFile"