Merge "libcutils: update fs_config tests for current behavior"
am: 0a4fcfb9cf

Change-Id: Ib9552762e972fdeb03157a93c18086773d380fbf