am 36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"

* commit '36fb373adfe8bbf9397dc8ccf405fd4d6baeef2f':
  fs_config: use libcutils and libselinux shared libraries