am c130d96e: am e1b87e1a: am 48257704: Merge "libcutils: add fs_config_generate"

* commit 'c130d96e9cf786d17196a400a07fb4e6e221a07c':
  libcutils: add fs_config_generate