Merge "libcutils: fs_config: Add folders normally created in init.rc"