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

* commit '8c9f052a77a21c7d771277e88edb0bd64eae9890':
  Revert "libcutils: fs_config read from file"