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

* commit '8797b7a1145eb72490a692a8dd73cc7d956d2b49':
  libcutils: add fs_config