Merge "ART: Track Flush & Close in FdFile"