am 852bb213: am 8c9f052a: am a791ec8a: Merge "Revert "libcutils: fs_config read from file""

* commit '852bb213c3a9db16cdec4e36d529fa8f63f25dec':
  Revert "libcutils: fs_config read from file"