Merge "libcutils: convert fs_config.cpp"