Merge "libcutils: fs_config.c code compliance"