Merge "Remove sbin from fs_config.cpp"
am: 26ec31ce8d

Change-Id: Idab86185136877bd50f61eab1f478cbb4daf92b1