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

* commit 'e1b87e1a0ee5d9b774fde68df8593b2fdeca4bb2':
  libcutils: add fs_config_generate