Merge "libcutils: fs_config() add check /oem/etc/fs_config_*" am: c530045850
am: 6b5913a8b6

Change-Id: I77bf1476f5565e05d7b30ccdb0481e389f8a49ba