Merge "Frameworks/base: Use holder in FileUtils" into nyc-dev