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

Change-Id: I1608f1a985f61a50cf5bcf5e80297945c3a8cfa8