Merge "ART: Track Flush & Close in FdFile" into lmp-mr1-dev