Merge "libcutils: fs_config() add check /oem/etc/fs_config_*"