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

Change-Id: If672c5031504303d2609366a54355039235a13ff