Merge "libcutils: add fs_config"