am 496c4eb6: am 6ac0d474: Merge "fs_config: move fs_config to libcutils"

* commit '496c4eb6a3db26ce307eff2d9be090e1c85f8639':
  fs_config: move fs_config to libcutils