am a134c414: am 2eeda522: am 0a9f6c8c: Merge "libcutils: fs_config read from file"

* commit 'a134c4145b15bc459736f4935600560fccb291fa':
  libcutils: fs_config read from file