am 48257704: Merge "libcutils: add fs_config_generate"

* commit '48257704b9c432c00d3383eb4f920f92a75485ed':
  libcutils: add fs_config_generate