am 89e2f942: Merge "libcutils: fs_config read from file"

* commit '89e2f942181feab45e7dab5b6d3183da0475a295':
  libcutils: fs_config read from file