Merge "Add /data/fonts/files directory"