Merge "libcutils: update fs_config tests for current behavior"