am 698198d0: am 8797b7a1: am d42df562: Merge "libcutils: add fs_config"

* commit '698198d09a0b56d74bf5185c1cf970a8e59ff49f':
  libcutils: add fs_config