Merge "Revert "libcutils: fs_config read from file""