Merge "android_filesystem_config: move fs_config to libcutils"